github - How to use zendstudio's git tool?

Question

A few questions about the picture above: 1. What is the complete submission and update process of Yishan? My current process is: Computer A -&gt; temp -&gt; commit -&gt; remote -&gt; push -&gt; Computer B -&gt; temp -&gt; pull, but the update often fails to come down. I don’t know the process...

仅有的幸福 · Answer

The difference between

fetch and pull

**fetch**只会拉取远程仓库的数据到本地，**不会合并到本地当前的分支上**。
**pull**拉取远程残酷数据到本地，并且会自动合并到本地当前的分支上。

Switch branch
```
$ git checkout 
```

Merge branches

$ git merge

合并只的是把其他分支的数据合并到当前分支，这个很重要。

One time completed submission update process:

$ git add <修改的文件 或者 新建的文件>

$ git commit -m "对本次提交做的说明"


拉取远程仓库别人做的提交

$ git pull

处理完冲突之后提交自己的代码

$ git push

These commands correspond to the operations in the IDE.