Commit b93557f5fc9c6bcd679278a444d6adcecffae631
1 parent
b49bcddb
提交命令
Showing
1 changed file
with
41 additions
and
0 deletions
README.md
| 1 | +先去gitlab上创建开发分之：feature/jipeihong | ||
| 2 | + | ||
| 3 | +在本地项目中git输入命令： | ||
| 4 | +git pull | ||
| 5 | + | ||
| 6 | +现在可以看到创建的开发分之，然后拉取开发分支 | ||
| 7 | +git fetch origin feature/jipeihong:feature/jipeihong | ||
| 8 | + | ||
| 9 | +（运行git status, 切记要没有修改） | ||
| 10 | + | ||
| 11 | +切换到开发分支： | ||
| 12 | +git checkout feature/jipeihong | ||
| 13 | + | ||
| 14 | +创建本地开发分支，对应gitlab开发分支： | ||
| 15 | +git checkout topic/jipeihong | ||
| 16 | + | ||
| 17 | +然后进行rebase： | ||
| 18 | +git rebase feature/jipeihong | ||
| 19 | + | ||
| 20 | +（然后就可以进行你的开发了） | ||
| 21 | + | ||
| 22 | +查看已经修改的东西 | ||
| 23 | +git status | ||
| 24 | + | ||
| 25 | +确认好后进行提交 | ||
| 26 | +git add . | ||
| 27 | + | ||
| 28 | +接着提交 | ||
| 29 | +git commit -m '你的提交评论' | ||
| 30 | + | ||
| 31 | +然后推送到gitlab | ||
| 32 | +git push origin topic/jipeihong:feature/jipeihong | ||
| 33 | + | ||
| 34 | +如果上面命令失败了，说明别人也同时有修改提交，需要你拉取下代码 | ||
| 35 | +git fetch origin feature/jipeihong:feature/jipeihong | ||
| 36 | + | ||
| 37 | +git rebase feature/jipeihong | ||
| 38 | + | ||
| 39 | +rebase没问题就可以继续前面的git push命令了。 | ||
| 40 | + | ||
| 41 | +rebase有问题的话需要解决下冲突。 | ||
| 0 | \ No newline at end of file | 42 | \ No newline at end of file |