I am doing a rebase, resolved some conflicts using FileMerge, and I have no outstanding conflicts. However when I resume the rebase, I get a dialog saying "Errors during merge," with no further information. Aside from aborting the rebase and starting over, how do I resolve this????
OK, this was the problem -- I am working on a Mac and using FileMerge as the external merge tool. FileMerge was set to create a backup of the pre-merge file (with an .orig) suffix. Adding a new file during rebase gets Sourcetree (CORRECTION: git) very upset. Once that was removed, the rebase continues fine.
Atlassian, please improve that error message? (Or include suggestions on possible causes?)
Are you sure it's not just because there are further conflicts generated from the next commit in the rebase? The rebase stops every time conflicts are encountered, then when you resolve and continue the rebase it applies the next commits in order and stops again if it hits more conflicts etc.
Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG