The difference is just in which starting edit position you'd prefer $MERGED for the file which contains the partially merged file with the merge conflict information or $BASE for the shared commit ancestor of $LOCAL and $REMOTE. In BOTH cases the middle pane is the file that you should edit to resolve the merge conflicts. The choice is whether to use $MERGED or $BASE in between $LOCAL and $REMOTE.Įither way Meld will display 3 panes with $LOCAL and $REMOTE in the left and right panes and either $MERGED or $BASE in the middle pane. # See 'Note On Output File' which explains -output "$MERGED".
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |