GitHub: Merging old branches

Question

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?

Answer 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).