Skip to content
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.

Sign up for GitHub

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

Jump to bottom

No way to merge sketch files #87

Closed
vinceangeloni opened this issue Jan 26, 2017 · 1 comment · May be fixed by rubarb666/git-sketch-plugin#26
Closed

No way to merge sketch files #87

vinceangeloni opened this issue Jan 26, 2017 · 1 comment · May be fixed by rubarb666/git-sketch-plugin#26

Comments

@vinceangeloni
Copy link

This might not be clear enough, or maybe I am doing something wrong.

Situation:

  • I make changes to my ui.sketch file. My co-worker makes changes to his ui.sketch file.
  • I stash my changes into a new branch, no biggie.
  • My co-worker commits, I pull in his changes.
  • I want to put merge my branch with my previous ui.sketch changes into the now updated master with his changes.

ui.sketch is now a conflict with no way to resolve. I understand merging these files probably isn't possible.

Am I correct?
@mathieudutour
Copy link
Owner

Indeed, I wrote a bit more about it here: https://blog.enki.com/yes-designers-can-use-git-too-79f3cef9c899#.hkpap1dsi

I'm currently working on a way to enable merge but it's very WIP and I don't have much time those days: #74

@rubarb666 rubarb666 mentioned this issue Jul 12, 2023
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

[Snyk] Security upgrade eslint-plugin-node from 4.2.2 to 6.0.0 rubarb666/git-sketch-plugin
2 participants
@vinceangeloni @mathieudutour