Moving master head to a branch

Question

I have several feature branches and a master branch. Feature2 is done. Normally I would rebase (working with a remote SVN repo and would like to keep the history, so no regular

Answer 1

It might be best to perform a non fast forward merge of feature 2 into master by using git merge --no-ff feature2 if you have checked out onto the master branch. You should end up with the following

feature1      C-D  
             /
master    A-B-E-----H          
               \   /                   
feature2        F-G