wiki/merge-conflict-resolution #693
Replies: 1 comment 1 reply
|
Comment |
1 reply
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Uh oh!
There was an error while loading. Please reload this page.
wiki/merge-conflict-resolution
When a merge conflict occurs in your repository A notification is sent to the device Sync methods other than Force Push and Force Pull are disabled A MERGE CONFLICT entry is added to the recent commits Clicking on the MERGE CONFLICT entry will Take you to the resolution dialog Allow you to navigate ...
https://gitsync.viscouspotenti.al/wiki/merge-conflict-resolution
All reactions