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

Track when merge conflicts happens from explicit merge

Browse source
This commit is contained in:
tidy-dev 2023-08-29 14:08:12 -04:00
parent 0d03faca5e
commit ddcb036a1c
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/lib/stores/app-store.ts
View file

@ -2656,6 +2656,8 @@ export class AppStore extends TypedBaseStore<IAppState> {
assertNever(conflictState, `Unsupported conflict kind`)
}
this.statsStore.recordMergeConflictFromExplicitMerge()
this._setMultiCommitOperationStep(repository, {
kind: MultiCommitOperationStepKind.ShowConflicts,
conflictState: {