请问一下，一般 mergetool 里面，$BASE, $LOCAL, $REMOTE 都对应的是什么文件？

This topic created in 2001 days ago, the information mentioned may be changed or developed.

cmd = 'C:/Program Files/KDiff3/kdiff3.exe' \"$BASE\" \"$LOCAL\" \"$REMOTE\" -o \"$MERGED\"

如上所示，Kdiff3 的配置。这三个都对应的是什么文件？我看有的 tool，比如，beyondcompare，好像含义有点不一样。我不知道是不是设置上述参数时，配置错了......

谢谢！

1 replies • 2020-12-23 14:54:31 +08:00

yazoox

Dec 23, 2020

refer to:
https://stackoverflow.com/questions/20381677/in-a-git-merge-conflict-what-are-the-backup-base-local-and-remote-files-that

```
the words LOCAL/REMOTE is somehow misleading, makes me thinking they are referring to "my changes"/"remote changes", but actually usually in context of "merge into master", LOCAL is the target branch which is other's modification, and REMOTE is the source branch which is my modifications.
```