Git: Merge to master while automatically choosing to overwrite master files with branch

by

To disregard master, when you have branch checked out then:

git merge master --strategy=ours

http://schacon.github.com/git/git-merge.html

As ‘Computer Linguist’ Lilith River
commented, this will “ignore everything from ‘master’, even if it has changes to new, independent files”. So if you are not the OP and want a more safe merge that does not as the OP says “forget the merging”, then use this excellent safe command from Lilith River, and upvote his comment up so he gets credit.

git merge -s recursive -X theirs <branch>

More Related Contents:

  1. Git – how to force merge conflict and manual merge on selected file
  2. Can I make fast forwarding be off by default in git?
  3. Pull a certain branch from the remote server
  4. git merge: Removing files I want to keep!
  5. What to do with branch after merge
  6. What exactly do we mean by “branch”?
  7. How to merge a specific commit in Git
  8. Track all remote git branches as local branches
  9. Git cherry pick and datamodel integrity
  10. Updates were rejected because the remote contains work that you do not have locally
  11. Why do I have to “git push –set-upstream origin “?
  12. How do I create a remote Git branch?
  13. Trying To Understand/Determine A Basic Git Workflow
  14. How to commit my current changes to a different branch in Git [duplicate]
  15. git rebase and git push: non-fast forward, why use?
  16. How do you remove an invalid remote branch reference from Git?
  17. Git: merging public and private branches while while keeping certain files intact in both branches
  18. Branching: different config files for release/development
  19. How would I write a pre-merge hook in Git?
  20. Are there any downsides to enabling git rerere?
  21. Switch branch and ignore any changes without committing
  22. Error “Updates were rejected because the remote contains work that you do not have locally”
  23. main branch and ‘origin/main’ have diverged, how to ‘undiverge’ branches’?
  24. How do I create a new Git branch from an old commit? [duplicate]
  25. In git, how do I remove a commit from one branch and apply it to a different branch?
  26. git: How do I add a custom merge strategy?
  27. How do I run git log to see changes only for a specific branch?
  28. git push error: src refspec main does not match any on linux
  29. git branch permissions
  30. git merging branches in a bare repository

Leave a Comment