git - SourceTree 和 Git

Question

我是 git 的新手，不熟悉源代码管理。当我使用 git 时有点困惑，不确定如何充分利用它的好处，而大多数时候，教程和信息太复杂了。谁能总结一下如何使用源代码树(基于 GUI 的 Git 工具)执行、提交和代码 merge 的简短列表？

我需要了解什么以及何时单击提交、 check out 、存储、获取、 pull 、推送、分支、 merge 和标记按钮。我如何比较和 merge 代码，在我的实验中它显示了如果我立即 merge 它无法理解的东西。因为我不知道如何比较代码。谢谢

更新与资源以下是我所做的一些研究，其中包含引用资料和链接，可让您快速掌握 git ;)

1. Try Git by Github (Fastest way to learn git)
2. Git commands cheatsheet
3. Git commands cheatsheet (summary of 1st link)
4. Merge Diff Tools

Answer 1

merge or rebase article很好地介绍了使用 SourceTree 进行的这些操作。

merge 本身包含在 this support answer 中: 如果发生冲突:

The conflicted files are marked with an exclamation mark in a yellow triangle.
You can see the diff on the right when you select the file, and you can see the diff against the two different parents by selecting 'Diff Parent' or 'Diff Merged' in the top bar of the diff area.

更一般地说，你可以设置一个diff tool for code comparison purpose :

click on the 'External Diff' button in the top-right.
Which diff tool is used is configured in Tools > Options > Diff (Windows) or Preferences > Diff (Mac).