Merge pull request desktop#17741 from desktop/address-17687-feedback

tidy-dev · web-flow · commit 51ec6c266f09 · 2023-11-28T09:19:09.000-05:00
Conflicts Resolutions Banner: Explain Null vs 0
diff --git a/app/src/ui/multi-commit-operation/dialog/conflicts-dialog.tsx b/app/src/ui/multi-commit-operation/dialog/conflicts-dialog.tsx
@@ -188,6 +188,14 @@ export class ConflictsDialog extends React.Component<
     )
   }
 
+  /**
+   * Renders the banner based on count of resolved files.
+   *
+   * If the count of resolved files is null, then the banner is
+   * not rendered as no conflicts have been resolved, yet. If the count of resolved
+   * files is 0, then there have been conflicts resolved, but they have been
+   * undone, we show an undone banner.
+   */
   public renderBanner(conflictedFilesCount: number) {
     const { countResolved } = this.state
     if (countResolved === null) {

Original file line number	Diff line number	Diff line change
`@@ -188,6 +188,14 @@ export class ConflictsDialog extends React.Component<`
`188`	`188`	`)`
`189`	`189`	`}`
`190`	`190`
	`191`	`+ /**`
	`192`	`+ * Renders the banner based on count of resolved files.`
	`193`	`+ *`
	`194`	`+ * If the count of resolved files is null, then the banner is`
	`195`	`+ * not rendered as no conflicts have been resolved, yet. If the count of resolved`
	`196`	`+ * files is 0, then there have been conflicts resolved, but they have been`
	`197`	`+ * undone, we show an undone banner.`
	`198`	`+ */`
`191`	`199`	`public renderBanner(conflictedFilesCount: number) {`
`192`	`200`	`const { countResolved } = this.state`
`193`	`201`	`if (countResolved === null) {`