Switch to Branch2 git checkout Branch2 Apply the current (Branch2) changes on top of the Branch1 changes, staying in Branch2: git rebase Branch1 Which would leave you with the desired result in Branch2: a — b — c <– Master \ d — e <– Branch1 \ d — e — f’ — g’ <– … Read more
How do we merge the master branch into the feature branch? Easy: git checkout feature1 git merge master There is no point in forcing a fast forward merge here, as it cannot be done. You committed both into the feature branch and the master branch. Fast forward is impossible now. Have a look at GitFlow. … Read more
NOTE: You can add other branches to exclude like master and dev if your workflow has those as a possible ancestor. Usually I branch off of a “sprint-start” tag and master, dev and qa are not ancestors. First, list locally-tracking branches that were merged in remote (consider using -r flag to list all remote-tracking branches). … Read more
UPDATE: You can add other branches to exclude like master and dev if your workflow has those as a possible ancestor. Usually I branch off of a “sprint-start” tag and master, dev and qa are not ancestors. First, list locally-tracking branches that were merged in remote (you may consider to use -r flag to list … Read more