How to merge a repo you have forked
https://help.github.com/articles/configuring-a-remote-for-a-fork/
https://help.github.com/articles/syncing-a-fork/
how to merge conflict
https://help.github.com/articles/resolving-a-merge-conflict-from-the-command-line/
how to revert all uncommitted changes
http://stackoverflow.com/questions/14075581/git-undo-all-uncommitted-changes
git reset
git checkout .
git clean -fdx
本文提供了一系列指南,包括配置远程仓库、同步分叉、合并冲突及还原未提交更改的方法,适用于使用Git进行版本控制的开发者。

被折叠的 条评论
为什么被折叠?



