nbdev - The Jupyter+git problem is now solved
GitSwarm-EE 2017.2-1 Documentation
Mergetools: Stop doing three-way merges!
Resolve Git conflicts | PyCharm
How to Resolve a Merge Conflict?
Resolving Merge Conflicts
Making sure you won't commit conflict markers
Versioncontrol - vscode-docs
Git Merge and Merge Conflict - javatpoint
Resolve Git merge conflicts - Azure Repos | Microsoft Learn
How to Deal with Merge Conflicts in Git | CSS-Tricks - CSS-Tricks
The Git Rerere Command — Automate Solutions to Fix Merge Conflicts | by Minh Pham | Level Up Coding
Temporary Merge Branch in diff3 Conflict Markers – nilbus.com
Version Control with Git: Conflicts
Git: Merge, Cherry-Pick & Rebase | An unconventional guide
Merge conflicts | GitLab
Understand the Git Conflict Markers | Delft Stack
Git Merge Conflicts | by Harsh Seksaria | Medium.com | Version Control System, Git and GitHub
Resolve Merge Conflicts with Bitbucket Power Editor | by Mohammed Davoodi | Mohami Blog
How can I fix & solve merge conflicts? | Learn Version Control with Git
A better Vimdiff Git mergetool | Vim Tips Wiki | Fandom
Git Conflicts
Automatic File Merging
Git Merge Conflicts | by Harsh Seksaria | Medium.com | Version Control System, Git and GitHub
How do I resolve merge conflicts in a Git repository? - Stack Overflow
Cannot merge resolved conflicts
Tips And Advice For Dealing With Merge Conflicts
