One of the most powerful tools a developer can have in their toolbox is git rebase. Yet it is notorious for being complex and misunderstood. The truth is, if you understand what it actually does, git rebase is a very elegant, and straightforward tool to achieve so many different
  • pythoneer@programming.devEnglish
    6·
    3 years ago

    What is the right chronological order of the git saga? Should I read this before of after the git checkout trilogy?

  • slipperydippery@lemmy.worldEnglish
    2·
    3 years ago

    I’ve accidentally had my git config set to rebase at my work. Every git pull merge dragged me into some conflict hell.

    I’m still interested and will read this article, mainly to see if there is a way to use it if the rest of the department isn’t.