Timeline for Git merge is not possible because I have unmerged files
Current License: CC BY-SA 4.0
17 events
| when toggle format | what | by | license | comment | |
|---|---|---|---|---|---|
| Feb 13, 2023 at 19:25 | comment | added | Harlin | Generally, it will tell you which file(s) specifically have a merge conflict. You can then open them up (while in merge mode with a decent editor like vscode or a JetBrains IDE) and see where the conflict is. There's not too much to it. | |
| Oct 16, 2022 at 6:10 | answer | added | Jesus | timeline score: -1 | |
| Sep 15, 2022 at 7:26 | answer | added | MUHINDO | timeline score: -1 | |
| Mar 31, 2022 at 18:58 | answer | added | A P | timeline score: 11 | |
| Oct 28, 2021 at 15:32 | answer | added | CAV | timeline score: 3 | |
| Oct 19, 2021 at 17:43 | history | protected | codeforester | ||
| May 28, 2021 at 3:12 | answer | added | levin | timeline score: 7 | |
| Sep 9, 2020 at 15:17 | answer | added | Tomasz Bartkowiak | timeline score: 30 | |
| S Mar 18, 2020 at 17:20 | history | edited | Jean-Philippe Caruana | CC BY-SA 4.0 |
rewording
|
| Mar 18, 2020 at 15:15 | review | Suggested edits | |||
| S Mar 18, 2020 at 17:20 | |||||
| Dec 3, 2018 at 21:51 | answer | added | davidjmcclelland | timeline score: 2 | |
| Sep 14, 2017 at 6:52 | review | Suggested edits | |||
| Sep 14, 2017 at 7:11 | |||||
| Aug 8, 2017 at 14:13 | answer | added | Mosaku Abayomi | timeline score: 86 | |
| May 12, 2017 at 9:01 | answer | added | Tobias Neis | timeline score: 5 | |
| Mar 18, 2016 at 14:27 | vote | accept | Kokodoko | ||
| Mar 18, 2016 at 13:54 | answer | added | Jonathan.Brink | timeline score: 42 | |
| Mar 18, 2016 at 13:53 | history | asked | Kokodoko | CC BY-SA 3.0 |