Re: [git-users] Git Merging Different Branches

2014-12-30 Thread Magnus Therning
On Wed, Dec 17, 2014 at 09:42:21AM -0800, Jason Neumann wrote: > I have a git repo with a couple of branches. The commit tree looks like > this: > > ***master > | | > | |--*feature > | > |--*qa > > So I created a qa branch from master, had some commits to ma

[git-users] Git Merging Different Branches

2014-12-18 Thread Jason Neumann
I have a git repo with a couple of branches. The commit tree looks like this: ***master | | | |--*feature | |--*qa So I created a qa branch from master, had some commits to master and to qa, then created a feature branch from master. Now I would like to me