git – merge conflict when local is deleted but file exists in remote

by

You should resolve the conflicts as you see fit. If the file really is supposed to be removed, and you will be publishing that change to origin, remove it again:

git rm path/to/file

If the file should in fact be tracked still, add it (the version in the work tree will be the version from origin):

git add path/to/file

After doing either of those to resolve the conflict, commit the merge.

More Related Contents:

  1. Remove sensitive files and their commits from Git history
  2. Checkout another branch when there are uncommitted changes on the current branch
  3. Listing and deleting Git commits that are under no branch (dangling?)
  4. How to grep Git commit diffs or contents for a certain word
  5. Permission denied (publickey) when deploying heroku code. fatal: The remote end hung up unexpectedly
  6. Git: How to ignore fast forward and revert origin [branch] to earlier commit?
  7. How to fix committing to the wrong Git branch?
  8. Can a Git hook automatically add files to the commit?
  9. Git push rejected “non-fast-forward”
  10. How to prevent Dockerfile caching git clone
  11. git 2.32 git push -u origin master Nothing happens
  12. How can I rollback a git repository to a specific commit?
  13. Reverting to a specific commit based on commit id with Git? [duplicate]
  14. Renaming branches remotely in Git
  15. How to push a local Git repository to another computer?
  16. git: symlink/reference to a file in an external repository
  17. git commit frequency
  18. Git commit that doesn’t override original authors in git blame
  19. How does git handle folder permission?
  20. How do I change case of the names of multiple files, already committed?
  21. How to keep different content of one file in my local and github repository?
  22. How to apply a Git patch to a file with a different name and path?
  23. Do you ignore a git submodule in your .gitignore or commit it to your repo?
  24. How can I make WinMerge my git mergetool?
  25. Can git permanently ignore a remote branch?
  26. git push to remote repository “Could not read from remote repository”
  27. Line endings messed up in Git – how to track changes from another branch after a huge line ending fix?
  28. Do GitHub and GitLab support git clone’s –filter parameter?
  29. When will `git pull –rebase` get me in to trouble?
  30. How to synchronize two git repositories

Leave a Comment