git for versioning

[martin f krafft]

also sprach Rustom Mody <rustompmody at gmail.com> [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 can't work with
detached heads, so you'd need to make a new branch there.

Once you made changes to such a branch, then you either merge this
branch into the branches for Beth and Albert and so on, in turn, or
you rebase each of these branches onto the tip of the branch you
worked on.

so if A,B,C are branes off master and you work a bit on master, then
either:

  for i in A B C: do
    git checkout $i
    git merge master
  done

or

  for i in A B C; do
    git rebase master $i
  done

I suggest you make a copy of the repo and try this stuff out to see
what the difference is. gitk is really useful to visualise the
graph.

-- 
martin | http://madduck.net/ | http://two.sentenc.es/
 
what do you mean, it's not packaged in debian?
 
spamtraps: madduck.bogus at madduck.net
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: Digital signature (see http://martin-krafft.net/gpg/)
URL: <http://lists.madduck.net/pipermail/vcs-home/attachments/20080730/b2621f47/attachment.pgp>