search

Home  >  Q&A  >  body text

Questions about git rebase

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?

習慣沉默習慣沉默2813 days ago562

reply all(1)I'll reply

  • PHPz

    PHPz2017-05-02 09:28:48

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

    reply
    0
  • Cancelreply