Stories of good collaboration workflows with Kactus
_Sorry, this is not a technical issue per se, but we are assessing the tool at the moment in our team and we are struggling a little bit trying to figure out what would be the good way to use Kactus in a multi-designer/dev team. And because I could not find any other discussion board relative to Kactus, I'm hoping this issue could serve as a placeholder for a broader discussion regarding good workflows using Kactus_

So our trouble comes around merging and branching. We are working with a series of Artboards representing different screens of our application. One of our designer created a branch and added a new Artboard to the list. While at the same time, another designer created his own branch, modified one of the existing Artboards and added another one. We merged the first designer's branch in master without problem. But when merging the second branch, there was, as expected, a merge conflict. The option offered was to choose between keeping the repo unchanged or erase the merge from the first branch and replace it with a merge from the second branch. This is not what we hoped for to solve the merge conflict. In the end we solved this manually by copy pasting things in between sketch files. But maybe we could adopt a better workflow and Sketch file organization that would prevent this impossible merge conflict?   

 
