On 8/29/05, Ben Greear <[EMAIL PROTECTED]> wrote: > I created a new branch 'ben_dev_rfcnt'. > > Now, I also have another patch that I wanted to pull into git. > > Before merging this, I created another branch 'foo'. > > I changed to this branch foo and imported my patch and resolved the > conflicts, etc.
Are you using git-checkout to change branches? If you have cogito installed, cg-status is a good, handy way of confirming you are where you expect to be. You can also do git-show-branch{,es-script} cheers, martin - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html