This repository has been archived by the owner on Sep 15, 2023. It is now read-only.
MINOR
- Added buttons for resolving both sides of a conflict in a merge at once
- The table that shows the merge conflicts now keeps its selection when the contents of the table are changed and retains focus after a conflict is resolved
- Added additional logging to the actions that are performed prior to a push
BUGFIX
- Fix: Accepting resolveable conflicts with imports leads to a disconnect between displayed content and actual content of the textPanes
- Fix: Discarding changes from the right side of a merge can lead to wrong indices for the changed chunks
- Fix: In some circumstances the calculation of the chunks can lead to an Exception that prevents displaying all other chunks