stop to merge develope into your own branch

时间：2019-12-28 14:09:00 阅读：76 评论：0 收藏：0 [点我收藏+]

Use rebase instead:

1. git checkout develop
2. git pull
3. git checkout feature/#X-my_feature
4. git rebase origin/develop

If there are some conflicts :
5. resolved conflicts
6. git rebase --continue
7. if there are still conflicts, go to 5

8. git push -f

原文：https://www.cnblogs.com/payzulla/p/12111456.html

踩

(0)

评论一句话评论（0）

分享档案

更多>