Last active
October 26, 2015 18:01
-
-
Save bigplants/3f8fcd33536aa517010e to your computer and use it in GitHub Desktop.
GitHubでマージ済のプルリクをrevertした後に引き続きrevertされたブランチで作業を続行したい時 ref: http://qiita.com/bigplants@github/items/3d1d3ada97d0c86d2548
This file contains 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
* 078468e (origin/master, master) Merge pull request #2 from bigplants/revert-1-develop | |
|\ | |
| * 0f2ceea Revert "second commit." | |
|/ | |
* fb717a2 Merge pull request #1 from bigplants/develop | |
|\ | |
| * 8e7a601 (HEAD, origin/develop, develop) second commit. | |
|/ | |
* 340f1ad first line | |
* f3f6327 first commit |
This file contains 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
* 078468e (HEAD, origin/master, master, develop) Merge pull request #2 from bigplants/revert-1-develop | |
|\ | |
| * 0f2ceea Revert "second commit." | |
|/ | |
* fb717a2 Merge pull request #1 from bigplants/develop | |
|\ | |
| * 8e7a601 (origin/develop) second commit. | |
|/ | |
* 340f1ad first line | |
* f3f6327 first commit |
This file contains 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
☁ revert_merged_commit_test [develop] git revert 078468e | |
error: Commit 078468e32c96bc0afcbf0a28d94c84c0c4a6cf5e is a merge but no -m option was given. | |
fatal: revert failed | |
☁ revert_merged_commit_test [develop] |
This file contains 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
commit 078468e32c96bc0afcbf0a28d94c84c0c4a6cf5e | |
Merge: fb717a2 0f2ceea | |
Author: Daiki Hirakata <daiki@bigplants.net> | |
Date: Tue Oct 27 01:40:39 2015 +0900 | |
Merge pull request #2 from bigplants/revert-1-develop | |
Revert "second commit." | |
(END) |
This file contains 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
Merge: fb717a2 0f2ceea |
This file contains 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
☁ revert_merged_commit_test [develop] git revert 078468e -m 1 | |
[develop d89fb5a] Revert "Merge pull request #2 from bigplants/revert-1-develop" | |
1 file changed, 1 insertion(+) | |
☁ revert_merged_commit_test [develop] |
This file contains 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
* d89fb5a (HEAD, origin/develop, develop) Revert "Merge pull request #2 from bigplants/revert-1-develop" | |
* 078468e (origin/master, master) Merge pull request #2 from bigplants/revert-1-develop | |
|\ | |
| * 0f2ceea Revert "second commit." | |
|/ | |
* fb717a2 Merge pull request #1 from bigplants/develop | |
|\ | |
| * 8e7a601 second commit. | |
|/ | |
* 340f1ad first line | |
* f3f6327 first commit | |
(END) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment