Situation:
- You have local uncommitted changes
- You pull from the master repo
- You get the error “Checkout conflict with files: xy”
Solution:
- Stage and commit (at least) the files xy
- Pull again
- If automerge is possible, everything is ok.
- If not, the pull merges the files and inserts the merge-conflict markers (<<<<<<, >>>>)
- Manually edit the conflicting files
- Commit and push