Git rebase mentions conflicts, but I haven't touched *anything* locally - Stack Overflow
Gitflow and Gitversion wrapped in Powershell - motowilliams
How To Resolve Git Conflicts After Rebase? | by Mugirase Emmanuel | Medium
Using the Swordfish Git repository with Eclipse
version control - Why is a 3-way merge advantageous over a 2-way merge? - Stack Overflow
pull with rebase" with conflicts doesn't end up in rebase flow · Issue #7222 · desktop/desktop · GitHub
Contributing Code with Pull Requests | Marlin Firmware
Merge (version control) - Wikipedia
Nick Farina - Git Is Simpler Than You Think
github - git push rejected, merge conflicts, git pull --rebase - Stack Overflow
Adam Wathan on Twitter: "Here's a Git thing that has been driving me nuts for years that I don't understand. Hit a conflict when rebasing. Fix the conflict, `git add` the changed
Technical Foundations of Informatics
Chapter 5.1 - Resolving Conflicts
How to do a git rebase, and why
Source Control with Git in Visual Studio Code
The Git Rerere Command — Automate Solutions to Fix Merge Conflicts | by Minh Pham | Level Up Coding
3-Way Merge or Merge Commit: Why Is It Better Than a 2-Way Merge?
Work with Git
Learning Git Tutorial: Interactive Rebasing | packtpub.com - YouTube
How to solve a CONFLICT (submodule) during rebase? - Development Team - ArduPilot Discourse
Source Control with Git in Visual Studio Code
Resolving Merge Conflicts in Git - YouTube
fetch - How to get deleted file after rebase in git - Stack Overflow
