How do I fix a merge conflict due to removal of a file in a branch?

by

The conflict message:

CONFLICT (delete/modify): res/layout/dialog_item.xml deleted in dialog and modified in HEAD

means that res/layout/dialog_item.xml was deleted in the ‘dialog’ branch you are merging, but was modified in HEAD (in the branch you are merging to).

So you have to decide whether

  • remove file using “git rm res/layout/dialog_item.xml“

or

  • accept version from HEAD (perhaps after editing it) with “git add res/layout/dialog_item.xml“

Then you finalize merge with “git commit“.

Note that git will warn you that you are creating a merge commit, in the (rare) case where it is something you don’t want. Probably remains from the days where said case was less rare.

More Related Contents:

  1. How do I resolve merge conflicts in a Git repository?
  2. Git merge left HEAD marks in my files
  3. Sharing rerere cache
  4. Undo a Git merge that hasn’t been pushed yet
  5. I ran into a merge conflict. How can I abort the merge?
  6. When do you use Git rebase instead of Git merge?
  7. How to cherry-pick a range of commits and merge them into another branch?
  8. Have Git Select Local Version On Merge Conflict on a Specific File?
  9. How can I selectively merge or pick changes from another branch in Git?
  10. Git workflow and rebase vs merge questions
  11. How can I merge multiple commits onto another branch as a single squashed commit?
  12. Why does git perform fast-forward merges by default?
  13. Is there a git-merge –dry-run option?
  14. Resolve Git merge conflicts in favor of their changes during a pull
  15. How can I merge two commits into one if I already started rebase?
  16. .gitignore and “The following untracked working tree files would be overwritten by checkout”
  17. How do I safely merge a Git branch into master?
  18. git remove merge commit from history
  19. Which version of the git file will be finally used: LOCAL, BASE or REMOTE?
  20. tell git to use ours merge strategy on specific files
  21. git merge, keep both
  22. Merge development branch with master
  23. how can I customize git’s merge commit message?
  24. How can I configure KDiff3 as a merge tool and diff tool for git?
  25. Restart/undo conflict resolution in a single file
  26. Is there a git-merge –dry-run option?
  27. git: merge two branches: what direction?
  28. Merging two remote repositories in Git
  29. Restore git files deleted after git merge –abort
  30. How do you detect an evil merge in git?

Leave a Comment