Browse Source

Shows rebase status even with no conflicts

main
Eric Amodio 4 years ago
parent
commit
b69a177d62
1 changed files with 2 additions and 5 deletions
  1. +2
    -5
      src/views/nodes/rebaseStatusNode.ts

+ 2
- 5
src/views/nodes/rebaseStatusNode.ts View File

@ -50,11 +50,8 @@ export class RebaseStatusNode extends ViewNode {
}
async getChildren(): Promise<ViewNode[]> {
if (this.status?.hasConflicts !== true) return [];
let children: FileNode[] = this.status.conflicts.map(
f => new MergeConflictFileNode(this.view, this, this.rebaseStatus, f),
);
let children: FileNode[] =
this.status?.conflicts.map(f => new MergeConflictFileNode(this.view, this, this.rebaseStatus, f)) ?? [];
if (this.view.config.files.layout !== ViewFilesLayout.List) {
const hierarchy = Arrays.makeHierarchical(

Loading…
Cancel
Save