| Version 2 (modified by , 17 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 (37)
- button-freeze.png (773 bytes ) - added by 15 years ago.
- compare-different-positions.png (649 bytes ) - added by 15 years ago.
- compare-in-one-list-only.png (685 bytes ) - added by 15 years ago.
- compare-options.png (3.4 KB ) - added by 15 years ago.
- conflict-dialog.png (38.5 KB ) - added by 15 years ago.
- node-resolve-main-commented.png (69.5 KB ) - added by 15 years ago.
- simple1-step-1.png (61.4 KB ) - added by 15 years ago.
- simple1-step-2.png (63.3 KB ) - added by 15 years ago.
- simple1-step-3.png (59.9 KB ) - added by 15 years ago.
- tag-resolve-1-commented.png (39.5 KB ) - added by 15 years ago.
- tag-resolve-2-commented.png (35.1 KB ) - added by 15 years ago.
- tag-resolve-3-commented.png (48.6 KB ) - added by 15 years ago.
- conflict-dialog_v19207.png (72.1 KB ) - added by 11 months ago.
- propertie-resolve-1_v19207.png (40.0 KB ) - added by 11 months ago.
- propertie-resolve-2_v19207.png (39.5 KB ) - added by 11 months ago.
- propertie-resolve-3_v19207.png (36.7 KB ) - added by 11 months ago.
- tabs_v19207.png (7.2 KB ) - added by 11 months ago.
- conflict-dialog-versions_v19207.png (240.2 KB ) - added by 11 months ago.
- one-tag-resolve-1_v19207.png (21.6 KB ) - added by 11 months ago.
- tags-resolve-1_v19207.png (25.8 KB ) - added by 11 months ago.
- one-tag-resolve-2_v19207.png (23.7 KB ) - added by 11 months ago.
- tags-resolve-2-commented_v19207.png (35.1 KB ) - added by 11 months ago.
- node-resolve-main-commented_v19207.png (91.1 KB ) - added by 11 months ago.
- nodes-simple1-step-1_v19207.png (46.1 KB ) - added by 11 months ago.
- nodes-simple1-step-2_v19207.png (49.7 KB ) - added by 11 months ago.
- nodes-simple1-step-3_v19207.png (44.7 KB ) - added by 11 months ago.
- compare-in-both-lists.png (1.7 KB ) - added by 11 months ago.
- member-resolve-main-commented_v19207.png (127.0 KB ) - added by 11 months ago.
- members-complex1-step-1_v19207.png (136.5 KB ) - added by 11 months ago.
- members-complex1-step-2_v19207.png (128.4 KB ) - added by 11 months ago.
- members-complex1-step-3_v19207.png (158.5 KB ) - added by 11 months ago.
- members-complex1-step-4_v19207.png (159.2 KB ) - added by 11 months ago.
- members-complex1-step-5_v19207.png (110.6 KB ) - added by 11 months ago.
- selected.png (5.1 KB ) - added by 11 months ago.
- not-selected.png (765 bytes ) - added by 11 months ago.
- tags-resolve-3-commented_v19207.png (35.2 KB ) - added by 10 months ago.
- one-tag-resolve-3-commented_v19207.png (28.9 KB ) - added by 10 months ago.
Note:
See TracWiki
for help on using the wiki.
