menu

Abstract

A platform for modern design teams to work together.

Channels
Team

Is anyone else getting a large number of conflicts when updating a branch from…

February 15, 2019 at 3:15pm

Is anyone else getting a large number of conflicts when updating a branch from the master? Several people on my team, across 3 different projects, are getting hundreds of merge conflicts when updating from the master. No substantial changes have been made to either the master or lower branches, and no change to the component library being referenced.

February 15, 2019 at 3:15pm

February 15, 2019 at 4:31pm

Happens all the time to me and it's a pretty massive headache. We use a pretty robust linked library of dynamic symbols used throughout our files, so I just assume it's inconsequential non-visual conflicts like layer names being out of sync (Sketch doesn't rename the symbol element in the layer list when you swap it out for another symbol) or layer styles naming or document colour swatches (which straight up disappear from time to time :/ ). 99.9% of the time, I resolve every conflict by selecting the Master option, but I gotta tap through 500+ times with the current set up. Multi-select here would be a game changer

  • reply
  • like

Yeah most of ours have clocked in at 300+ so far. Hopefully they can resolve this soon or at least give us a workaround like the one you've described (multi-select or some such thing).

  • reply
  • like

We just released an update which should resolve this issue: https://www.goabstract.com/release-notes/

  • reply
  • like