| Version 2 (modified by Harry Wood, 4 years ago) (diff) |
|---|
Back to Main Help
Conflicts Dialog
Make sure you don't edit outside of the area you have downloaded in order to reduce the problem of conflicts
Resolve conflicts by opening the 'conflicts' panel, selecting the one of the listed conflicts and choosing whether to accept 'theirs' or 'mine'.
TODO expand on this explanation.
Back to Main Help
Attachments (12)
- button-freeze.png (773 bytes) - added by stoecker 2 years ago.
- compare-different-positions.png (649 bytes) - added by stoecker 2 years ago.
- compare-in-one-list-only.png (685 bytes) - added by stoecker 2 years ago.
- compare-options.png (3.4 KB) - added by stoecker 2 years ago.
- conflict-dialog.png (38.5 KB) - added by stoecker 2 years ago.
- node-resolve-main-commented.png (69.5 KB) - added by stoecker 2 years ago.
- simple1-step-1.png (61.4 KB) - added by stoecker 2 years ago.
- simple1-step-2.png (63.3 KB) - added by stoecker 2 years ago.
- simple1-step-3.png (59.9 KB) - added by stoecker 2 years ago.
- tag-resolve-1-commented.png (39.5 KB) - added by stoecker 2 years ago.
- tag-resolve-2-commented.png (35.1 KB) - added by stoecker 2 years ago.
- tag-resolve-3-commented.png (48.6 KB) - added by stoecker 2 years ago.
Download all attachments as: .zip
