Skip to content

Commit

Permalink
Discard changes to apps/desktop/src/lib/vbranches/branchController.ts
Browse files Browse the repository at this point in the history
  • Loading branch information
ndom91 committed Sep 10, 2024
1 parent 6a0bc0e commit 2652fe9
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion apps/desktop/src/lib/vbranches/branchController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ export class BranchController {
if (stashedConflicting.length > 0) {
return `The following branches were stashed due to a merge conflict during updating the workspace: \n\n \
${stashedConflicting.map((branch) => branch.split(branchRefPrefix)[1]).join('\n')} \n\n \
You can find them in the "Branches" sidebar in order to resolve conflicts.`;
You can find them in the 'Branches' sidebar in order to resolve conflicts.`;
} else {
return undefined;
}
Expand Down

0 comments on commit 2652fe9

Please sign in to comment.