This is a read-only archive of the Framer Community on Facebook.

What is Framer? Join the Community
Return to index
Gerrit Kaiser
Posted Jun 28 - Read on Facebook

We're trying to collaborate on a framer prototype via git. Unfortunately we keep running into merge conflicts with a few files. `framer/.bookmark`, `framer/config.json` and especially `framer/framer.vekter.js`. Is it safe to remove these from git and ignore them (everyone is using Framer Studio)?

Design mode also unfortunately doesn't seem very git-friendly, lots of things in `framer/design.vekter` (like layer IDs!) seem to change whenever someone makes a tiny change, so we've had to abandon this and move towards generating layers in code 😥

3 Comments

Felix Haus

Have you considered to stage files before commit them?
https://githowto.com/staging_changes
With this command you have the possibility to only commit certain file-changes (e.g. app.coffee) instead of commit all changes.
Staging is simpler when you use a GUI-Tool for it rather than the command-line, would recommend SourceTree for it.
https://www.sourcetreeapp.com

Peter Duchastenier

Why not add theis files to .gitignore ?

Gerrit Kaiser

Peter Duchastenier that would be a good solution. But as I don't fully understand their contents, I'm not sure if that would break anything or if they can be re-generated by framer studio

Read the entire post on Facebook