How to merge 2 branches in git keeping the changes only from one branch

Question

I have two branches. One is master, and the other one i myBranch and they look something like this:

master | | myBranch | / | / |/ |

I want to merge them into one branch, keeping all the changes from the master branch, not keeping anything from myBranch.

I think I know what you mean, - and that I have had the same problem, but the way you've written your question, it sounds as if the answer is "keep master and throw away myBranch" .... — MortenSickel
– MortenSickel, Commented Dec 20, 2012 at 8:41
That sounds like just keeping the master branch and deleting myBranch. — spolto
– spolto, Commented Dec 20, 2012 at 8:41
If you don't want the changes in myBranch why doing a merge? — Atropo
– Atropo, Commented Dec 20, 2012 at 8:44
Yes I want to keep master but I don't want to delete myBranch because I'm using the same branch for another project (this was stupid idea, right?) — nikmin
– nikmin, Commented Dec 20, 2012 at 8:47
Sounds like your wanting to create a new repo for myBranch first and then delete myBranch from this repo? — PhearOfRayne
– PhearOfRayne, Commented Dec 20, 2012 at 8:51

user4815162342 · Accepted Answer · 2012-12-20 10:05:10Z

Merge the branch using the ours merge strategy:

git checkout -b new-branch master git merge -s ours myBranch

Note that this is quite different from the -X ours, as initially stated in Koraktor's answer. -X ours is an option to the recursive strategy, which would still keep all changes from myBranch, but prefer resolutions from master in case of conflict. -s ours, on the other hand, completely ignores changes introduced by myBranch.

wandarkaf · Accepted Answer · 2012-12-20 08:43:10Z

3

Just delete the branch: git branch -d "myBranch"

answered Dec 20, 2012 at 8:43

wandarkaf

1,92720 silver badges31 bronze badges

Comments

Koraktor · Accepted Answer · 2012-12-20 08:50:50Z

$ git checkout -b new-branch $ git merge -s ours myBranch

If you want this to happen directly on master, just omit the first command.

PS: "user4815162342" is right, I meant -s not -X.

Collectives™ on Stack Overflow

How to merge 2 branches in git keeping the changes only from one branch

3 Answers 3

Comments

Comments

Comments

Hot Network Questions

Collectives™ on Stack Overflow

3 Answers 3

Comments

Comments

Comments

Related