development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-10-31 05:19:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert mistake and add documentation

Browse source
This commit is contained in:
Sergio Padrino 2023-09-06 17:54:09 +02:00
parent 4043d34830
commit 8c09c2523a
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/ui/dispatcher/dispatcher.ts
View file

@ -1284,7 +1284,12 @@ export class Dispatcher {
manualResolutions
)
if (result === RebaseResult.ConflictsEncountered) {
// At this point, given continueRebase was invoked, we can assume that the
// rebase encountered some conflicts and they have been resolved. Getting
// now a CompletedWithoutError result means that the rebase has completed
// successfully and there aren't more conflicts to resolve, therefore we can
// track this as a successful rebase with conflicts.
if (result === RebaseResult.CompletedWithoutError) {
this.statsStore.recordOperationSuccessfulWithConflicts(kind)
}