Auto-resolve any conflicts by favoring the working branch version (theirs keyword has reversed meaning in this case)

git rebase

  • Reapply commits from one branch on top of another branch.
    Commonly used to "move" an entire branch to another base, creating copies of the commits in the new location.
    More information: <https://git-scm.com/docs/git-rebase>.
  • Trick copyright: tl;dr; <https://github.com/tldr-pages/tldr>

git rebase -X theirs {{branch_name}}

click the source code to copy install git rebase on any operating system with command-not-found.com