4

I'm new to Git, so let me know if there is a better way to do this...

So I forked a project on github that I am making changes to work the way that I want it to. One of the changes I made was to remove a file. So I removed the file with git rm filename. Now I want to pull the latest changes from the original repo that I forked, so I did git pull original-remote-repo master. But it gave a message saying there was a conflict with the file that I deleted (since it's deleted in my repo, but changes were made to it in the "original-remote-repo"). I don't care about any changes to this file since I deleted it.

Is there something I need to do in order to merge these without recreating the file (since I would have to delete it again anyway)? Or is there a better workflow that I should be adopting?

Andrew
  • 227,796
  • 193
  • 515
  • 708
  • Possible duplicate of [git - merge conflict when local is deleted but file exists in remote](https://stackoverflow.com/questions/4319486/git-merge-conflict-when-local-is-deleted-but-file-exists-in-remote) – IMSoP Jul 19 '19 at 09:31

1 Answers1

5

There is a merge conflict because you've changed content on your repository (ie, deleted the file in question), and upstream has also changed content to the same location (ie, that file in question).

Git has no way of knowing if you want your changes, or their changes, because it can't determine which one is "correct" (that is, it can't merge the changes cleanly).

I suggest resolving the merge conflict by deleting the file. (Yes, again).

The changes upstream has made most likely depends on their changes to this file, so your merge probably wont' work (After all, they almost certainly changed that file for a reason!), but I'm sure that you'll figure that out because it's now your responsibility to manage that difference, at least, for your tree, so I would review the merge commit and make other changes that ensure that it still works.

Arafangion
  • 11,517
  • 1
  • 40
  • 72