Git – Ignore files during merge

by

I got over this issue by using git merge command with the --no-commit option and then explicitly removed the staged file and ignore the changes to the file.
E.g.: say I want to ignore any changes to myfile.txt I proceed as follows:

git merge --no-ff --no-commit <merge-branch>
git reset HEAD myfile.txt
git checkout -- myfile.txt
git commit -m "merged <merge-branch>"

You can put statements 2 & 3 in a for loop, if you have a list of files to skip.

More Related Contents:

  1. How do you merge two Git repositories?
  2. Moving Git repository content to another repository preserving history
  3. Merge changes from remote github repository to your local repository
  4. How to rebase one Git repository onto another one?
  5. Git: add vs push vs commit
  6. git subtree: possible to change subtree branch/path in a forked repository?
  7. How do I push a new local branch to a remote Git repository and track it too?
  8. How do I update or sync a forked repository on GitHub?
  9. How to move some files from one git repo to another (not a clone), preserving history
  10. Git Push Error: insufficient permission for adding an object to repository database
  11. Git – how to force merge conflict and manual merge on selected file
  12. Git: ignore some files during a merge (keep some files restricted to one branch)
  13. Git merge reports “Already up-to-date” though there is a difference
  14. Rebasing a Git merge commit
  15. How do I clone a Git repository into a specific folder?
  16. heroku: src refspec master does not match any
  17. How to “git show” a merge commit with combined diff output even when every changed file agrees with one of the parents?
  18. Is it possible to pull from one repo and push to other one?
  19. Delete local Git branches after deleting them on the remote repo
  20. Should I add the Visual Studio 2015 .vs folder to source control?
  21. How to change git ssh user for a remote push temporarily?
  22. Git – how to force manual merge even if there is no conflict
  23. GitHub changes repository to the wrong language
  24. Git push failed, “Non-fast forward updates were rejected”
  25. git: merge two branches: what direction?
  26. Can a project have multiple origins?
  27. What is git’s “filemode”?
  28. How to reduce git repo size on Bitbucket?
  29. git merging branches in a bare repository
  30. How to convert a Git repo to a submodule, which is nested in another (parent) Git repo?

Leave a Comment