Merging

[Majdi-Zlitni]

Does LearnGitBranching support git merging and resolve conflict?

[pcottle]

Merging yes, but not resolving conflicts. That kind of depends on having files to edit and communicating the desired state of the file, which was something I never bothered to implement. It's also a pretty large separate topic that there are other resources for online.