Sublime Forum

Merge performance issue with many many file changes

#1

Say there’re thousands of files deleted in the dev branch compared to my branch, it takes several minutes to generate the merge commit with conflict files, till here it’s fine.

But it also take minutes to open the 3 column merge window and another minutes to save the merge.
Any space to improve the performance here?

PS: I see there’s really large memory consuming in Task Manager, about 6 GB

1 Like

#2

I’m having similar issues when syncing Unreal Engine. I have ~70,000 staged changes and have about 26 GB in flight. I waited about 10 minutes and gave up. I resorted to trying to just use git diff on individual files using smerge mergetool - but it still opens the entire repo up instead of just a 3 pane diff :frowning:

0 Likes