Created
June 6, 2021 17:28
-
-
Save iwantroca/bdc426439aa1e0d10d224f02b169c133 to your computer and use it in GitHub Desktop.
merge
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| [iwantroca@alkalimetals temp]$ ls | |
| script.js | |
| [iwantroca@alkalimetals temp]$ git log | |
| commit a08b37bbae56cb0fc4081b84a620b8e43b68c4bb (HEAD -> main) | |
| Author: Iwantroca <[email protected]> | |
| Date: Sun Jun 6 22:56:32 2021 +0530 | |
| Add customized message | |
| commit 699389964fc0da4ab9e32dbb42ab0dd3433052d9 | |
| Author: Iwantroca <[email protected]> | |
| Date: Sun Jun 6 22:26:23 2021 +0530 | |
| Initial Commit | |
| [iwantroca@alkalimetals temp]$ git status | |
| On branch main | |
| You are currently reverting commit 6993899. | |
| (fix conflicts and run "git revert --continue") | |
| (use "git revert --skip" to skip this patch) | |
| (use "git revert --abort" to cancel the revert operation) | |
| Unmerged paths: | |
| (use "git restore --staged <file>..." to unstage) | |
| (use "git add/rm <file>..." as appropriate to mark resolution) | |
| deleted by them: script.js | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| [iwantroca@alkalimetals temp]$ git revert 699389964f | |
| error: Reverting is not possible because you have unmerged files. | |
| hint: Fix them up in the work tree, and then use 'git add/rm <file>' | |
| hint: as appropriate to mark resolution and make a commit. | |
| fatal: revert failed |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment