Suggest an edit

Leave this empty

What version are you on? (for example Windows 11 24H2, macOS 26, iOS 18, Chrome 140)

Which step?
1. Find the conflicting files2. Open each file and find the markers3. Edit the file to its final content4. Stage the resolved files5. Finish the merge or rebaseA step is missingSomething else on the page

What should it say?

Screenshot (optional, up to 4 MB)

Your email (optional, only if you want a reply)

Send suggestion