Better handling of sync conflicts

[msexxeta]

I am getting tons of sync conflicts and manually cleaning up simple conflicts that could be automerged is really tedious.

Opencloud keeps a version history for files, so adding a method for detecting if a file can be automerged should be possible, there are many solutions out there that could be employed. It could be hidden behind a flag for people that still want to clean up manually.

Another nice thing to have would be to have merge client integrations in the opencloud client, much like IDEs bring their own or use merge clients on the system, because I really don't want to go hunting for those sync conflict files all the time. I'd like the client to have a button that says "merge conflicts" and it starts either its own or an installed merge utility like winmerge.

[msexxeta]

Implemented as two PRs:

• Desktop client: Add opt-in text conflict automerge desktop#934
• Craft blueprint dependency: Add libgit2 dependency for desktop client craft-blueprints-opencloud#6

[micbar]

@dragotin @kulmann
Please advise if this is aligned with the product and your professional view on that.