4 ms·

Interesting. We solved the problem of file management and versioning by having the designers use Github Desktop. Tracking files, changes, versions, commit messa

• tenaciousDaniel 7y ago
  I've been hesitant to recommend that because I don't know how git handles image changes. If you don't mind me asking, how do your designers handle rebasing and conflict resolution?
  • eindiran 7y ago
    You should just use the same tricks for images that you would use for binary files. Instead of doing a diff, and merging the bits and pieces of conflicting files, you want to select the version from the two branches that you want. In a merge, select the desired version (eg `git checkout --theirs -- logo.png` for the version from the branch you're merging into the current branch or `git checkout --ours -- logo.png` for the version from the current branch), then add the file and complete a normal merge commit. git merge foo git checkout --theirs -- logo.png git add logo.png git commit -m "Merging foo into master" See here for some more info: https://stackoverflow.com/questions/278081/resolving-a-git-conflict-with-binary-files https://stackoverflow.com/questions/278081/resolving-a-git-c...
• faramarz 7y ago
  Well.. that's what the Abstract is; Visual Git for Sketch files. We're using Abstract + Sketch at the moment and I can't complain. Being able to export the file or opening it track/untracked is a real benefit sometimes. That said, Figma promises to be the combination of Abstract + Sketch + Invision and thats what has me intrigued. Going to a Figma webinar may ease a lot of my worry.