714
edits
常见问题-获取与更新项目的GIT源代码: Difference between revisions
Jump to navigation
Jump to search
→Add an external commit into current repository
(→克隆) |
|||
| Line 223: | Line 223: | ||
For this, follow this tutorial: https://help.github.com/articles/creating-a-pull-request/ | For this, follow this tutorial: https://help.github.com/articles/creating-a-pull-request/ | ||
= | =将外部提交添加到当前存储库= | ||
Some developers may work and do commit into their own Git repository after forking the project. If you are interesting into getting this changes, you can import them with the following steps. | Some developers may work and do commit into their own Git repository after forking the project. If you are interesting into getting this changes, you can import them with the following steps. | ||
| Line 245: | Line 245: | ||
</source> | </source> | ||
= | =解决冲突= | ||
If a file has been marked as "conflict" after a Pull, open the file to edit it. | If a file has been marked as "conflict" after a Pull, open the file to edit it. | ||
Find string "<<<<<<<<<<", you will see part of code that is conflict between "<<<<<<<<<" and ">>>>>>>>". Edit manually code lines and remove "<<<<<<<<" and ">>>>>>>". | Find string "<<<<<<<<<<", you will see part of code that is conflict between "<<<<<<<<<" and ">>>>>>>>". Edit manually code lines and remove "<<<<<<<<" and ">>>>>>>". | ||
| Line 264: | Line 264: | ||
</source> | </source> | ||
= | =标记源代码= | ||
With GIT Command Line Interface: | With GIT Command Line Interface: | ||
| Line 282: | Line 282: | ||
</source> | </source> | ||
= | =创建新分支= | ||
With GIT Command Line Interface: | With GIT Command Line Interface: | ||
| Line 299: | Line 299: | ||
It may also be required to edit the .git/config file to have project linked by default onto new branch. | It may also be required to edit the .git/config file to have project linked by default onto new branch. | ||
= | =删除分支= | ||
With GIT Command Line Interface: | With GIT Command Line Interface: | ||
| Line 307: | Line 307: | ||
</source> | </source> | ||
= | =将维护分支 x.x 合并到 dev 分支= | ||
With Eclipse: | With Eclipse: | ||
| Line 316: | Line 316: | ||
*Commit and push. | *Commit and push. | ||
= | =将分支推送到另一个Git服务器= | ||
You may want to synchronize another GIT server. | You may want to synchronize another GIT server. | ||
To synchronize push to another server, this is how to proceed. | To synchronize push to another server, this is how to proceed. | ||
| Line 330: | Line 330: | ||
</source> | </source> | ||
= | =统计= | ||
With GIT Command Line interface: | With GIT Command Line interface: | ||