![]() It’s possible to press more than one button if code from multiple panes is valid. So if the LOCAL file (your file) had the right changes in it, you’d press B. ![]() Pressing one of those buttons will resolve the conflict with the code from pane A, B, or C on top. When a conflict is highlighted, you can press any combination of the A, B, and C buttons in the toolbar. You can move from one unresolved conflict to the next using the triple up and triple-down colored arrows in the middle of the tool bar. It currently has a Merge Conflict that you need to fix. If you run your SCM’s merge command (here, in mercurial: hg merge -r 2), and have kdiff3 configured as your merge tool, you’ll get a pop-up window like this: As you can see, it shows you all 4 pieces of information, BASE, LOCAL, and REMOTE on top, and the MERGE_RESULT file on the bottom. If you’ve got 2 heads that you need to merge in your current repository: We made this modification to file.txt: diff -git a/file.txt b/file.txtĪnd they made this change to the same file and line: diff -git a/file.txt b/file.txt But like linux, it’s functional and can help you quickly be productive once you get over the learning curve. It’s not pretty it’s cross-platform Qt based so it has a very old-school linux GUI feel to it. Most other 3-way merge tools either conflate or omit the BASE and that can make it harder to see what the right thing to do is. Where you came from ( LOCAL), where the other person’s changes came from ( REMOTE), where you both started ( BASE) and where you are now ( MERGE_RESULT). You often need to see all four of these pieces of information to make intelligent choices.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |