development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-09-20 00:21:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor to reuse wall of text 😂

Browse source
This commit is contained in:
Sergio Padrino 2021-06-04 14:06:37 +02:00
parent 19c5752505
commit be3f38cead
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/src/ui/undo/warn-local-changes-before-undo.tsx
View file

@ -65,11 +65,7 @@ export class WarnLocalChangesBeforeUndo extends React.Component<
some of these changes being lost.
<br />
<br />
Also, undoing a merge commit will apply the changes from the merge
into your working directory, and committing again will create an
entirely new commit. This means you will lose the merge commit and, as
a result, commits from the merged branch could disappear from this
branch.
{this.getMergeCommitUndoWarningText()}
<br />
<br />
Do you want to continue anyway?
@ -78,10 +74,7 @@ export class WarnLocalChangesBeforeUndo extends React.Component<
} else if (this.props.commit.isMergeCommit) {
return (
<>
Undoing a merge commit will apply the changes from the merge into your
working directory, and committing again will create an entirely new
commit. This means you will lose the merge commit and, as a result,
commits from the merged branch could disappear from this branch.
{this.getMergeCommitUndoWarningText()}
<br />
<br />
Do you want to continue anyway?
@ -97,6 +90,13 @@ export class WarnLocalChangesBeforeUndo extends React.Component<
}
}
private getMergeCommitUndoWarningText() {
return `Undoing a merge commit will apply the changes from the merge into
your working directory, and committing again will create an entirely new
commit. This means you will lose the merge commit and, as a result, commits
from the merged branch could disappear from this branch.`
}
private onSubmit = async () => {
const { dispatcher, repository, commit, onDismissed } = this.props
this.setState({ isLoading: true })