After attempting a merge when I press the resolve button the next screen shows the spinning status for 2-4 minutes.
- The project has 20,000+ files but the file with the conflict is never more than a few thousand lines.
- The cancel button also freezes the UI for about 4-5 seconds (every time).
- After showing the resolve screen once subsequent resolving doesn’t have the same delay.
Not sure if this is Sublime Merge or git. There’s no status that I’m aware of so if this was git it would be nice to know what git was doing.
Is this a known issue? If not is there anyway I could help you reproduce the problem?