This is a very early attempt to add support to skip the stage part of Merge Conflicts.
All changes connected to MergeState is a second part planned to do a "CompleteConflictResolution" without doing the stage part. I have not managed to get that part working yet.
The change in sideResolver (class MergeConflictsView) is a quick&dirty fix to (as I see it) an existing problem.
So in the end there are quite few changes so far connected to the added "Skip Stage" functionality.
The reason for this change is the plan to use merge-conflicts together with GitHub Desktop.
In some cases you lose the possibility to commit in GitHub Desktop if the change is staged.
This is a very early attempt to add support to skip the stage part of Merge Conflicts.
All changes connected to MergeState is a second part planned to do a "CompleteConflictResolution" without doing the stage part. I have not managed to get that part working yet.
The change in sideResolver (class MergeConflictsView) is a quick&dirty fix to (as I see it) an existing problem.
So in the end there are quite few changes so far connected to the added "Skip Stage" functionality. The reason for this change is the plan to use merge-conflicts together with GitHub Desktop. In some cases you lose the possibility to commit in GitHub Desktop if the change is staged.