Questions about git rebase
習慣沉默
習慣沉默 2017-05-02 09:26:48
0
1
559

For a feature with a relatively long time span, I want to rebase it regularly based on develop during the development process. However, after rebase, there are many conflicts. And after rebase, it should be many versions ahead, but it always prompts that the version is behind. What is the reason? How to avoid problems with many conflicts? Is there a good solution?

習慣沉默
習慣沉默

reply all(1)
PHPzhong

Can you add a picture? gitk --branches develop feature and the like.

Latest Downloads
More>
Web Effects
Website Source Code
Website Materials
Front End Template