github - how to resolve "There are unresolved conflicts in the working directory" in Git desktop? - Stack Overflow
Resolve simple merge conflicts on GitHub - The GitHub Blog
GitHub Desktop 1.5 Simplifies Merge Conflict Resolution - InfoQ
Merge conflicts cause confusion and aren't handled well · Issue #5400 · desktop/desktop · GitHub
Activity: Use the GitHub Desktop client | I'd Rather Be Writing Blog and API doc course
Version Control with Git: Conflicts
Merge Conflicts: What They Are and How to Deal with Them | CSS-Tricks - CSS-Tricks
Sometimes GitHub Desktop does not recognize that there is no merge needed · Issue #12250 · desktop/desktop · GitHub
display manual conflict resolution options in app · Issue #6062 · desktop/ desktop · GitHub
Resolving Merge Conflicts · GitHub
Version Control with Git: Conflicts
Syncing your branch in GitHub Desktop - GitHub Docs
Always give option of use mine / theirs for conflicts · Issue #8248 · desktop/desktop · GitHub
unity game engine - Always resolve conflicts in Git with ours or theirs - Stack Overflow
If no default editor found, user cannot use Merge Conflicts · Issue #6060 · desktop/desktop · GitHub
Cannot see all conflicts · Issue #6213 · desktop/desktop · GitHub
Binary conflict resolve doesn't work · Issue #8059 · desktop/desktop · GitHub
Cannot see all conflicts · Issue #6213 · desktop/desktop · GitHub
GitHub Desktop Improves Merge Conflict Resolution
Pulling commits after fixing a merge conflict says that there are conflicts left to resolve · Issue #11959 · desktop/desktop · GitHub
Cannot see all conflicts · Issue #6213 · desktop/desktop · GitHub
Merge conflicts cause confusion and aren't handled well · Issue #5400 · desktop/desktop · GitHub
Github pull request with conflicts, Github desktop - YouTube
Merge conflicts issue · Issue #5264 · desktop/desktop · GitHub
Version Control with Git: Conflicts
Pulling and Pushing Project
An Introduction to Version Control Using GitHub Desktop | Programming Historian
