Github Desktop: Solve a Merge Conflict

Merge conflicts often happen when two persons edit the same file. How do we solve these conflicts? Here is a solution via Github Desktop.

Software used in this tutorial:

* Github Desktop: https://desktop.github.com/
* Atom: https://atom.io/
* Per's github repos: https://github.com/asathoor?tab=repos...
* Browser: Chrome.

• #education
• #github
• #github_desktop
• #merge_conflict