Use this guide when Git stops a merge, pull or rebase with a conflict message. Have your terminal or editor open in the project and, if possible, know who made the other changes.
Step by step
Stay calm and check the status
Run git status to see which files have conflicts; they are listed as both modified. Nothing has been lost at this point. If you want to start again, git merge --abort or git rebase --abort returns you to where you were.
Members
The rest of this guide is for members
This guide continues with 4 more sections. Unlock this guide and all 279 ABCDayZ guides with checklists, troubleshooting and next steps.
£3.99 for 1 month or £29 for 12 months. One payment, no automatic renewal.
Unlock all guidesAlready a member on another device? Open your personal access link. Bought Programming with AI? Your first month is included.