I have a local git repository created with git svn clone
. I make a local branch, make some changes, switch back to master, git svn rebase
and if it's all good, I merge my branch back into master. Then the tree looks something like this:
alt text http://img.skitch.com/20090108-cjguu3hcci9x2k17mcftamw8f1.jpg
Sometimes, later when I git svn rebase
again and get some remote changes, it loses the fact that a_branch was merged into the mainline and the tree looks like this:
alt text http://img.skitch.com/20090108-kn3bn1qgi5ijw8ja5ijkd75pa3.jpg
Why is that? Can I stop it? Is there an easy way to tell that a branch was merged, or should I delete my branches when I'm done so I don't forget what has and hasn't been merged?