A tool that allows to automatically merge to git branches with different versions of a Mastodon project file. The tool should automatically merge the branches if there is no conflict in the mastodon file. It should also find conflicts and show these to the user and offer ways to resolve the conflicts.
The merge tool can be base on the diff tool from mastodon-sc/mastodon-git#11 and the existing merge algorithm in mastodon-tomancak.
This issue is part of mastodon-sc/mastodon-git#12
A tool that allows to automatically merge to git branches with different versions of a Mastodon project file. The tool should automatically merge the branches if there is no conflict in the mastodon file. It should also find conflicts and show these to the user and offer ways to resolve the conflicts.
The merge tool can be base on the diff tool from mastodon-sc/mastodon-git#11 and the existing merge algorithm in mastodon-tomancak.