• Elliott Risby, 3 years ago

    Hey Jonathan!

    Fair points. We def need to get more of this content up on our site.

    1. Yes we do! :)

    2. True - the side by side dif comparison is probably more practical in most occasions. as shown here

    3. Yes we do have conflict resolution down to the artboard level. We wrote an article about handling merge conflcts here

    4. We have feedback backed right in. When you go into an artboard you can post your comments directly on the artboard. You can also share these links through our web app Gathering feedback in Trunk

    Cheers, Elliott

    0 points
    • Jonathan ShariatJonathan Shariat, 3 years ago

      Thanks for the info!

      For me the biggest factor is getting to layer specific conflicts. Imagine if devs had a conflict in a long code file and had to pick which one they wanted. If I make a change and my copy editor makes a change, we need to be able to merge it and discard any accidental design tweaks they might have made in the file.

      This is why Figma is a front runner for me. It makes this all moot. The file is live and anyone can work on it at the same time.

      0 points