-
Notifications
You must be signed in to change notification settings - Fork 39
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
如何理解git rebase? #112
Labels
Comments
Open
实际工作中的rebase一次完整的rebase流程
如果rebase中途出现问题,可以使用git rebase --abort恢复。 git rebase的目的是保持当前feature分支与master主分支同步的另一种方式,虽然与merge的效果相同,但是比merge更加简洁高效。 为什么说rebase比merge更加简洁高效呢?实际工作中的一个常见场景:在我们的feature开发期间,master上可能发布了很多release,修复了很多hotfix。而且可能刚好影响到了我们目前开发的feature。此时我们需要将feature的代码与master保持同步。 同步有几种方法:自己写一遍;merge;rebase。
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
在merge PR的过程中,rebase and merge会产生冲突,因此需要补充一下Git rebase的知识点。
The text was updated successfully, but these errors were encountered: