github - How to use zendstudio's git tool?

Question

First picture

Some Problems:

1. What is the complete submission and update process of Yishan?
My current process is:
A computer-> temp -> commit -> remote -> push -> ; Computer B-> temp -> pull
But there are often cases where the update fails. I don’t know if the process is correct. Do I need to manually switch versions or merge after pulling on computer B?

2.What is the difference between fetch from upstream and pull?

3.What is the difference between push and push to upstream?

4.How to switch versions?

5.How to switch branches?

6. How to merge branches?

.

Answer 1

1. The difference between

   fetch and pull

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

2. Switch branch

   $ git checkout <branch name>

3. Merge branches

   $ git merge <branch name>

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

4. One time completed submission update process:

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

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

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

   $ git pull

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

   $ git push

   These commands correspond to the operations in the IDE.