Simply record git development specifications
-
Create a branch: Everyone pulls down the project, then switches to the dev branch, and creates a branch named with the pinyin of your name, such as
zhenlin
, and then in自己的分支上进行开发
. -
Create a problem: create one when you want to develop a function
大概的描述的问题
, as follows
- Submit specific code: When submitting the code of this function
关联上这个代码的问题id (下图)
, the submission information is similar to "#1 完成登陆页面的基本布局
". Try完整简洁
to explain your own改动
- The problem development at a certain stage is completed: keep the last temporary code (
add . commit
after,先不要push
) userebase
the别人的dev
progress同步到自己分支
1. Switch to the dev branch,
git pull origin dev
(pull the latest)
2. Switch back to your own branch,git rebase dev
3. After prompting the completion of rebase,git push origin 自己的分支
This completes the submission.
5. Problem development completed: 创建合并请求
and 指派给组长(zhenlin)
let组长把代码合并到dev分支
The development specifications of git are probably these, mainly to facilitate everyone's synchronization and collaboration!