-
-
Notifications
You must be signed in to change notification settings - Fork 94
Home
Hwan Soo Kang edited this page Sep 11, 2022
·
2 revisions
Welcome to the OSS-lect wiki!
PC@DESKTOP-482NOAB MINGW64 /c/OSS/git/11w/base (main)
$ git rebase -i head~4
error: invalid line 1: resolve conflict in main.py
You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
Or you can abort the rebase with 'git rebase --abort'.
PC@DESKTOP-482NOAB MINGW64 /c/OSS/git/11w/base (main|REBASE)
$ git rebase --abort
PC@DESKTOP-482NOAB MINGW64 /c/OSS/git/11w/base (main)
$ git rebase -i head~4
Successfully rebased and updated refs/heads/main.
PC@DESKTOP-482NOAB MINGW64 /c/OSS/git/11w/base (main)
$ git logg1 --all
* fa18248 (HEAD -> main) resolve conflict in main.py
* f790576 D
* d504d54 dB
* 328df87 dA
* e599646 C
* 8e1e813 B
* af2443d A
PC@DESKTOP-482NOAB MINGW64 /c/OSS/git/11w/base (main)
$ git rebase -i head~4
[detached HEAD f113a7e] D
Date: Sun Sep 11 12:18:22 2022 +0900
1 file changed, 2 insertions(+)
Successfully rebased and updated refs/heads/main.
PC@DESKTOP-482NOAB MINGW64 /c/OSS/git/11w/base (main)
$ git logg1 --all
* f113a7e (HEAD -> main) D
* d504d54 dB
* 328df87 dA
* e599646 C
* 8e1e813 B
* af2443d A