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 master and to qa, > then created a feature branch from master. > > Now I would like to merge the feature branch into qa. When i checkout qa > and run `git merge feature --no-commit` I see that it's trying to merge the > commits to master that occurred after qa was checked out. While this is > technically ok because qa needs to be updated from master, I feel like this > isnt the right process. Should I rebase or qa before merging the feature
What makes you think that it isn't the right process? AFAIU you want to create this: master *─────*────* │ │ feature │ └────────────* │ │ └─────────*─────────────* qa That is, you want to merge in all changes that's happened on `feature` after the branch point and that necessarily involves any changes on `master` between the branch point of `qa` and `feature` too. > branch? No branches have been created from the qa branch so I know I wont > break the repo if I rebase. Merging master and then merging feature seem > like it wouldn't be any different than just merging feature. Is that > correct? You would get a history that looks different, since you have two merge changesets. However, content wise there should be no different. > Any suggestions on the matter would be appreciated. Just go ahead with the merge you initially planned. /M -- Magnus Therning OpenPGP: 0xAB4DFBA4 email: mag...@therning.org jabber: mag...@therning.org twitter: magthe http://therning.org/magnus Most software today is very much like an Egyptian pyramid with millions of bricks piled on top of each other, with no structural integrity, but just done by brute force and thousands of slaves. -- Alan Kay -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
Description: PGP signature