DevGuide

这是万门的第一篇开发指南，一切从这里开始。

Dev Flow

我们使用github作为我们的代码托管工具，我们的日常开发也要遵循github flow，虽然这未必最好的流程，但从一个小规模的团队来说，我还是很认可这种方式的。

• Create a branch right from the repository.
• Create, edit, and delete files, rename them, or move them around.
• Send a pull request from your branch with your changes to kick off a discussion.
• Continue making changes on your branch as needed, updating the pull request automatically.
• Once the branch is ready to go, the pull request can be merged using the big green button.
• Branches can then be tidied up using the delete buttons in the pull request, or on the branches page.
• Repeat.

详情请看这里

这里稍微解释一下，就是每一个新的修改，应当基于upstream branch新建一个branch来做，然后向upstream项目发起pull request，然后进行code review，等待别人merge pull request。

项目的master分支用来跟upstream进行同步用，不从master分支发起pull reuqest。

常用命令

• git fetch origin
• git pull origin master
• git checkout master
• git checkout -b {new_branch_name}
• git push origin {branch_name}
• git rebase origin/master
• git commit
• git add