git local remote base merge

最新推荐文章于 2023-03-06 10:03:51 发布

iteye_5926

最新推荐文章于 2023-03-06 10:03:51 发布

阅读量691

点赞数

分类专栏： git 文章标签： git

本文链接：https://blog.csdn.net/iteye_5926/article/details/82652660

版权

git 专栏收录该内容

1 篇文章 0 订阅

订阅专栏

http://stackoverflow.com/questions/5440610/git-and-difftool-problems-what-do-local-and-remote-point-to

there are 4 components to this (note that before this step, you would have already done a local-checkin.)

The local-checkin that your git tree has: LOCAL
The head of the remote repository (that is going to be merged): REMOTE
common ancestor to both LOCAL and REMOTE: BASE
The file that will be written as a result: MERGED.