Extract logic into variable to aide in readability

BBhelp · Oct 15, 2018 · ee4e718 · ee4e718
1 parent 38be4b4
commit ee4e718
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts
@@ -1483,9 +1483,10 @@ export class AppStore extends TypedBaseStore<IAppState> {
 
     const repository = selection.repository
     const repoState = this.repositoryStateCache.get(repository)
+    // check if conflicts exist by inspecting conflictState: null means no conflicts exist
+    const conflictsExist = repoState.conflictState !== null
 
-    // check if we're in a conflicted state
-    if (repoState.conflictState === null) {
+    if (conflictsExist) {
       return
     }