GIT Meld 如何在合并期间保留两个更改？
GIT Meld how to keep both changes during merge?
我在 Sourcetree 中使用 Meld 来解决冲突。
面临的问题是我必须 select 本地或远程更改并且我不能同时保留这两个更改。知道这在 Meld 中是否可行吗？
您可以选择一侧，然后按键盘上的 CTRL 键添加另一侧。如果您想在之前添加的更改上方或下方添加，它会提示您。
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.
我在 Sourcetree 中使用 Meld 来解决冲突。 面临的问题是我必须 select 本地或远程更改并且我不能同时保留这两个更改。知道这在 Meld 中是否可行吗？
您可以选择一侧，然后按键盘上的 CTRL 键添加另一侧。如果您想在之前添加的更改上方或下方添加，它会提示您。
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.