git merge: Removing files I want to keep!

by

This is an interesting issue. Because you deleted the file after BranchA was created, and then are merging master into BranchA, I’m not sure how Git would be able to realize there is a conflict.

After the bad merge you can undo, and then re-merge, but add back the file:

git checkout HEAD@{1} .
git merge --no-commit master
git checkout master test.txt
git add test.txt
git commit

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 to master while automatically choosing to overwrite master files with branch
  5. What to do with branch after merge
  6. Branch from a previous commit using Git
  7. How to replace master branch in Git, entirely, from another branch? [duplicate]
  8. How do I clone a single branch in Git?
  9. Using the slash character in Git branch name
  10. Is it possible for git-merge to ignore line-ending differences?
  11. Merging: Hg/Git vs. SVN
  12. What is the precise meaning of “ours” and “theirs” in git?
  13. git cherry-pick says “…38c74d is a merge but no -m option was given”
  14. How can I search Git branches for a file or directory?
  15. Git – Ignore files during merge
  16. Forking vs. Branching in GitHub
  17. How do I get the current branch name in Git?
  18. How do I delete all Git branches which have been merged?
  19. Reordering of commits
  20. How do you remove an invalid remote branch reference from Git?
  21. git partial merge, not whole branch
  22. Simple tool to ‘accept theirs’ or ‘accept mine’ on a whole file using git
  23. How can I get the parents of a merge commit in Git?
  24. How to get default Git branch?
  25. Reverting a git merge while allowing for the same merge later)
  26. How do I list all remote branches in Git 1.7+?
  27. Git: How to list commits on this branch but not from merged branches
  28. How do I make git merge’s default be –no-ff –no-commit?
  29. How to perform a three-way diff in Git without merging?
  30. How do you see / show a git merge conflict resolution that was done, given a merge commit SHA1?

Leave a Comment