intersystems / intersystems/git-source-control

There is no obvious way to abort a revert

Open
#811 0 comments 0 reactions 0 assignees View on GitHub
Dominant language
ObjectScript
Stars
22
Forks
14
Avg merge
1d 9h
Merged PRs (30d)
5

Description

When doing a 'Revert' using WebUI the Git repository is put into a state like the following:

```
$ git status
On branch raymond/revert-test
You are currently reverting commit 03045669.
(all conflicts fixed: run "git revert --continue")
(use "git revert --skip" to skip this patch)
(use "git revert --abort" to cancel the revert operation)

Changes to be committed:
(use "git restore --staged ..." to unstage)
modified: ...
```

There is not an obvious way to move out of this state. You cannot do any of the suggested commands except manually directly on the Git repo.

If for example you discard the changes that are presented in the workspace as a result of the revert, you are *still* performing a revert afterwards, like so:

```
$ git status
On branch raymond/revert-test
You are currently reverting commit 03045669.
(all conflicts fixed: run "git revert --continue")
(use "git revert --skip" to skip this patch)
(use "git revert --abort" to cancel the revert operation)

nothing to commit, working tree clean
```

Performing a commit gets out of this state and seems to have the same effect as the suggested `git revert --continue`. Switching to another branch and back does get you out of this state too, I have not tried any other options.

This is a bit unintuitive and I could imagine a user not familiar with this situation potentially getting confused or stuck.

Contributor guide

Open the contributing guide

Assessment

This issue has not been assessed yet.

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.