Algolia on Twitter: "Different uses of #Git`rebase`- first, as a way to integrate and exchange your work between two branches (like `merge` does), but also as a history rewriting tool. Explained in
Resolving Merge Conflicts from the GitLab UI | GitLab
Resolve Git conflicts | IntelliJ IDEA Documentation
git - What are different among of Accept Yours, Accept Theirs and Merge in GitHub in Android Studio? - Stack Overflow
Git: Ours or Theirs? (Part 1) - DEV Community
How To Resolve Merge Conflicts in Git {Step-by-Step Guide}