Timeline for How to use Git's default commit message when resolving merge conflicts?
Current License: CC BY-SA 3.0
6 events
| when toggle format | what | by | license | comment | |
|---|---|---|---|---|---|
| Mar 17 at 17:12 | comment | added | klausw | About the fatal: Error in line 1:... error - the input on stdin needs to be in the same format as FETCH_HEAD which contains tab-separated fields. Add a tab (\t) character after the parent hash. | |
| Aug 10, 2020 at 21:54 | comment | added | RJFalconer | @randombits it would still require conflict resolution, but would not generate a merge commit. | |
| May 2, 2020 at 0:37 | comment | added | randombits | How exactly would a rebase not also cause conflict, versus a merge? | |
| Jan 31, 2013 at 0:44 | vote | accept | yoyodyn | ||
| Dec 19, 2012 at 23:51 | comment | added | Maic López Sáenz | How is this command used? Documentation says that it expects the merge objects to be provided by stdin. I tried piping into it, and also providing through a file, the revision numbers of the parents, but it kept throwing back a fatal: Error in line 1:.... | |
| Dec 19, 2012 at 22:26 | history | answered | Andy Ross | CC BY-SA 3.0 |