Re: git for versioning

2008-07-30 Thread Ben Finney
"Rustom Mody" <[EMAIL PROTECTED]> writes: > On Wed, Jul 30, 2008 at 5:19 PM, martin f krafft wrote: > > also sprach Rustom Mody: > >> If I want to work on changes in the common part, I check out (a tag > >> for) the point before the branch (as a detached head??) > >> Work on that and then what?? T

Re: git for versioning

2008-07-30 Thread martin f krafft
also sprach Manish <[EMAIL PROTECTED]> [2008.07.30.1520 +0200]: > I am also new to git so just to confirm. Merge will leave us with one > less branch whereas a rebase will move our changes on top of the > changes of other branch. Right? No, you'll have two branches in both cases. The distinction

Re: git for versioning

2008-07-30 Thread Manish
2008/7/30 martin f krafft : > also sprach Rustom Mody [2008.07.30.1322 +0200]: >> If I want to work on changes in the common part, I check out (a tag >> for) the point before the branch (as a detached head??) >> Work on that and then what?? Thats my question. > > Don't you have a comm

Re: git for versioning

2008-07-30 Thread Rustom Mody
On Wed, Jul 30, 2008 at 5:19 PM, martin f krafft <[EMAIL PROTECTED]> wrote: > also sprach Rustom Mody <[EMAIL PROTECTED]> [2008.07.30.1322 +0200]: >> If I want to work on changes in the common part, I check out (a tag >> for) the point before the branch (as a detached head??) >> Work on that and th

Re: git for versioning

2008-07-30 Thread martin f krafft
also sprach Rustom Mody <[EMAIL PROTECTED]> [2008.07.30.1322 +0200]: > If I want to work on changes in the common part, I check out (a tag > for) the point before the branch (as a detached head??) > Work on that and then what?? Thats my question. Don't you have a common branch, like master? You ca

Re: git for versioning

2008-07-30 Thread Rustom Mody
On Wed, Jul 30, 2008 at 4:33 PM, Manish <[EMAIL PROTECTED]> wrote: > On Wed, Jul 30, 2008 at 2:43 PM, Rustom Mody wrote: > > On Wed, Jul 30, 2008 at 12:47 PM, martin f krafft wrote: > >> also sprach Rustom Mody [2008.07.30.0851 +0200]: > >>> But how do I work on the base and have it push (yeah,

Re: git for versioning

2008-07-30 Thread Manish
On Wed, Jul 30, 2008 at 2:43 PM, Rustom Mody wrote: > On Wed, Jul 30, 2008 at 12:47 PM, martin f krafft wrote: >> also sprach Rustom Mody [2008.07.30.0851 +0200]: >>> But how do I work on the base and have it push (yeah, that's not >>> exactly the word) its changes through the (branches f

Re: git for versioning

2008-07-30 Thread martin f krafft
also sprach Rustom Mody <[EMAIL PROTECTED]> [2008.07.30.1113 +0200]: > >> But how do I work on the base and have it push (yeah, that's not > >> exactly the word) its changes through the (branches for) Albert, Beth > >> and Foo? > > > > You push them to a central location and they fetch&merge from t

Re: git for versioning

2008-07-30 Thread Rustom Mody
On Wed, Jul 30, 2008 at 12:47 PM, martin f krafft <[EMAIL PROTECTED]> wrote: > also sprach Rustom Mody <[EMAIL PROTECTED]> [2008.07.30.0851 +0200]: >> But how do I work on the base and have it push (yeah, that's not >> exactly the word) its changes through the (branches for) Albert, Beth >> and Foo

Re: git for versioning

2008-07-30 Thread martin f krafft
also sprach Rustom Mody <[EMAIL PROTECTED]> [2008.07.30.0851 +0200]: > But how do I work on the base and have it push (yeah, that's not > exactly the word) its changes through the (branches for) Albert, Beth > and Foo? You push them to a central location and they fetch&merge from there, or they fe