-
Notifications
You must be signed in to change notification settings - Fork 86
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Stories of good collaboration workflows with Kactus #100
Comments
Hi @xuv - I can tell you what has worked for my team. We have a similar structure and we solved these issues in 3 steps:
Hope this helps. |
Hello @mpaiva. Thanks for sharing your experience. Does it mean that you are only using Kactus for the sketch symbol library file, not for the main design files? Did I understood you correctly? |
Our team keeps the components Library in a separate repo. As we work on the different areas of the product those would have separate repositories. Each repository has other sketch files containing the views. |
This link may help you understand a bit more. |
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?
The text was updated successfully, but these errors were encountered: