Timeline for Git merge is not possible because I have unmerged files
Current License: CC BY-SA 4.0
6 events
when toggle format | what | by | license | comment | |
---|---|---|---|---|---|
Feb 6, 2022 at 17:48 | comment | added | DeSpeaker | I found that execute the command "git restore --staged <filename>" solved the problem for me. | |
Jul 27, 2020 at 17:47 | comment | added | john k | Fatal: there is no merge to abort | |
S May 5, 2019 at 15:55 | history | suggested | MMehta | CC BY-SA 4.0 |
improved formatting
|
May 5, 2019 at 14:43 | review | Suggested edits | |||
S May 5, 2019 at 15:55 | |||||
Aug 8, 2017 at 14:34 | review | Late answers | |||
Aug 8, 2017 at 14:46 | |||||
Aug 8, 2017 at 14:13 | history | answered | Mosaku Abayomi | CC BY-SA 3.0 |