git local remote base merge

最新推荐文章于 2021-12-29 16:05:55 发布

iteye_5926

最新推荐文章于 2021-12-29 16:05:55 发布

阅读量728

点赞数

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

本文链接：https://blog.youkuaiyun.com/iteye_5926/article/details/82652660

版权

git 专栏收录该内容

1 篇文章

订阅专栏

本文解析了Git中合并操作涉及的四个关键概念：本地已检入的版本（LOCAL）、远程仓库的头部（REMOTE）、两者共同祖先（BASE）以及合并后的文件（MERGED）。通过理解这些概念，可以帮助开发者更好地解决合并过程中遇到的问题。

摘要生成于 C知道，由 DeepSeek-R1 满血版支持，前往体验 >

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.