Git branching for new product variation

Question

I\'m using git to manage a repository I\'m working on.

the master branch is the \"main\" project. However, I\'m also working on a parallel product that is s

Answer 1

after you have branched, you will be able to do a git rebase master on your new project branch to move it's separation point up to the HEAD of the master branch. what this will do is re-apply all of the diffs (which will be very easy and possibly have no major, if any, conflicts since most of the files are no longer in the newproject branch) from the newbranch separation point on top of the changes done to the master branch. Since the newproject commits include the removal of those files and other changes, everything should go smoothly (with hopefully not too many conflicts). Check out the rebasing info listed under the de-facto git book linked here.