SourceTree and Git

Question

I am new to git and not familiar with source control. Get confused when I come to git and don’t know how to take full advantage of it, while most of the time, the tutorial and the information are too complicated. Can someone generalize a short list on how to use the source tree (GUI based on the git Tool) to execute and commit and compile the code?

What I need to know, and when I need to press the commit, statement, lay out, extract, pull, push, fork, merge and tag button. How can I compare and combine code, in my experiment, he showed that something cannot be understood if I immediately combine it. Because I do not know how to compare the code. thanks

Update and resources Here are some studies I did, with links and links for quick git selection;)

• Try git by Github (The fastest way to learn git)
• Git cheatsheet team
• Git cheatsheet team (1st link summary)
• Combine Diff Tools

Answer 1

Merging or reinstalling the article is a good introduction to those operations with SourceTree.

The merge itself is covered by this support response : in case of conflict:

Conflicting files are marked with an exclamation mark in the yellow triangle.
You can see the diff on the right when you select the file, and you can see the diff for two different parents by selecting “Diff Parent” or “Diff Merged” on the top line of the difference area .

More generally, you can install the diff tool for the purpose of comparing code :

Click the " External Diff " button in the upper right corner.
Which comparison tool is used is configured in Tools > Options > Diff (Windows) or Preferences > Diff (Mac).