1

So say you branch off your master to create a "new feature #101" for your application. Now this feature isn't going to be pushed to the master until X months from now (we'll say 3 months). In that 3 month period, say we branch off other features pushed to the master, and even a few bug fixes directly to master. We now have a master branch with 14+ commits since our "new feature #101". So now say it's +3 months and time to push "new feature #101", what's the best way to merge that into master? Do we do a straight merge into the master, do we rebase "new feature #101"? What's the correct way?

Michael Mikhjian
  • 2,760
  • 4
  • 36
  • 51

1 Answers1

1

Merge master into new feature #101 first, clean up all merge conflicts, and then it will be a simple merge back into master (also easier to see the diff that way).

jnevelson
  • 2,092
  • 2
  • 21
  • 31
  • Now would this sill work cleanly when "new feature #101" has a dozen or so commits? – Michael Mikhjian Jan 25 '13 at 04:50
  • Yep. The point is that you want your feature branch completely up to date with master, so that the HEAD of your feature branch is just ahead of master, and the merge just switches the pointer of the HEAD. – jnevelson Jan 25 '13 at 16:46
  • So a "newer" master merging into this "new feature" (but has old contents of various files), still clean merge master into new feature? I think I've got everything figured here correctly. – Michael Mikhjian Jan 25 '13 at 19:13