Jay Taylor's notes

back to listing index

Dealing with changes

[web search]
Original source (meldmerge.org)
Tags: git conflicts merging tools meldmerge.org
Clipped on: 2023-11-29

Dealing with changes

Meld deals with differences between files as a list of change blocks or more simply changes. Each change is a group of lines which correspond between files. Since these changes are what you're usually interested in, Meld gives you specific tools to navigate between these changes and to edit them. You can find these tools in the Changes menu.

Navigating between changes

You can navigate between changes with the Changes ▸ Previous change and Changes ▸ Next change menu items. You can also use your mouse's scroll wheel to move between changes, by scrolling on the central change bar.

Changing changes

In addition to directly editing text files, Meld gives you tools to move, copy or delete individual differences between files. The bar between two files not only shows you what parts of the two files correspond, but also lets you selectively merge or delete differing changes by clicking the arrow or cross icons next to the start of each change.

The default action is replace. This action replaces the contents of the corresponding change with the current change.

Hold down the Shift key to change the current action to delete. This action deletes the current change.

Hold down the Ctrl key to change the current action to insert. This action inserts the current change above or below (as selected) the corresponding change.

About

© 2012 Kai Willadsen
Written By
  • Kai Willadsen
Creative Commons

This work is licensed under a Creative Commons Attribution-Share Alike 3.0 Unported License.

As a special exception, the copyright holders give you permission to copy, modify, and distribute the example code contained in this document under the terms of your choosing, without restriction.