Timeline for Git merge is not possible because I have unmerged files
Current License: CC BY-SA 4.0
5 events
| when toggle format | what | by | license | comment | |
|---|---|---|---|---|---|
| Sep 16, 2022 at 9:54 | comment | added | Kiran | git rm helped me | |
| Nov 22, 2020 at 14:04 | comment | added | Prabs |
after git status I'd to do git add path for Changes not staged for commit.
|
|
| Sep 11, 2020 at 11:44 | history | edited | Tomasz Bartkowiak | CC BY-SA 4.0 |
deleted 25 characters in body
|
| Sep 11, 2020 at 9:57 | comment | added | Kokodoko | It's just such an unhelpful error message.... In my case it mostly means that I have merge conflicts that have to be fixed manually. It would help a lot if the error message actually said that. | |
| Sep 9, 2020 at 15:17 | history | answered | Tomasz Bartkowiak | CC BY-SA 4.0 |