Search code examples
gitgit-branchgit-merge

Git merge branch into master

I have a master branch and a working branch_1. I want to 'move' branch_1 exactly as it is to master. So I want something like this:

git checkout master
git merge branch_1 # I don't know what is correct...

Things which I did but I got loads of files messed up with annoying conflicts. So now master contains exactly the same files of branch_1 avoiding any conflicts, just overwriting files. Any help?

Solution

  • Conflicts are going to happen if both branches have changes to the files. This is a good thing. Keeping your branches up-to-date with each other will prevent some of them . However over all, conflicts are not bad. The rebase option can also prevent many of them from happening.

    git merge branch_1

    If you are on master, merging will bring the changes as you expect.

    http://www.kernel.org/pub/software/scm/git/docs/git-merge.html

    You could also

    git rebase branch_1

    This will take the changes from branch_1 and append them to master without a merge commit.

    http://www.kernel.org/pub/software/scm/git/docs/git-rebase.html