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

2020-12-14 11:03:42 +08:00
 yazoox
cmd = 'C:/Program Files/KDiff3/kdiff3.exe' \"$BASE\" \"$LOCAL\" \"$REMOTE\" -o \"$MERGED\"

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

谢谢!

603 次点击
所在节点    问与答
1 条回复
yazoox
2020-12-23 14:54:31 +08:00
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.
```

这是一个专为移动设备优化的页面(即为了让你能够在 Google 搜索结果里秒开这个页面),如果你希望参与 V2EX 社区的讨论,你可以继续到 V2EX 上打开本讨论主题的完整版本。

https://www.v2ex.com/t/735167

V2EX 是创意工作者们的社区,是一个分享自己正在做的有趣事物、交流想法,可以遇见新朋友甚至新机会的地方。

V2EX is a community of developers, designers and creative people.

© 2021 V2EX