|Using a topic branch with EGit [message #756237]
||Fri, 11 November 2011 15:31
| Paul Webster
Registered: July 2009
I'm looking for suggestions or workflows that can help me use EGit with a modified topic branch workflow. My current usecase for fixing a bug:
1) from master, use Team>Switch To>New Branch to create my topic branch, pwebster/bugXXXX
2) work on my bug
3) commit my fix
4) switch back to master
5) merge from pwebster/bugXXXX
6) delete pwebster/bugXXXX
This works fine, until there are commits on master. If I try an merge into master I get a merge node, which we don't want in our history for basic bug fixes. The problem is I can't tell that I need to rebase my pwebster/bugXXXX branch before I switch to master, because a fetch won't do a FF merge from origin/master to master while I'm on my topic branch.
Do I really need to switch to master, pull, switch back, rebase, switch to master, and keep going?
Powered by FUDForum
. Page generated in 0.14643 seconds