Git Merge Conflict - Remote File Deleted, Local File Changed

git git-merge git-merge-conflict
xylar picture xylar · Jul 25, 2012 · Viewed 17.7k times · Source

I merged in changes from another branch but I am getting conflicts because a file has been deleted on the remote branch but has changes on local branch.

I would like to delete the file - I tried git rm path/to/file but it says file: needs merge. What is the best way of removing the file and committing the merge?

Answer

fork0 picture fork0 · Jul 25, 2012

Try using the --force parameter:

git rm --force <file>

If you want to keep the file in filesystem:

git rm --cached <file>

Related questions

How to resolve merge conflicts in Git repository?

I want to resolve merge conflicts in my Git repository. How to do that ?

Read More
I ran into a merge conflict. How can I abort the merge?

I used git pull and had a merge conflict: unmerged: _widget.html.erb You are in the middle of a conflicted merge. I know that the other version of the file is good and that mine is bad so all …

Read More
Resolve Git merge conflicts in favor of their changes during a pull

How do I resolve a git merge conflict in favor of pulled changes? Basically I need to remove all conflicting changes from a working tree without having to go through all of the conflicts with a git mergetool while keeping …

Read More