Skip to main content

You are not logged in. Your edit will be placed in a queue until it is peer reviewed.

We welcome edits that make the post easier to understand and more valuable for readers. Because community members review edits, please try to make the post substantially better than how you found it, for example, by fixing grammar or adding additional resources and hyperlinks.

4
  • 2
    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:.... Commented Dec 19, 2012 at 23:51
  • 1
    How exactly would a rebase not also cause conflict, versus a merge? Commented May 2, 2020 at 0:37
  • 1
    @randombits it would still require conflict resolution, but would not generate a merge commit. Commented Aug 10, 2020 at 21:54
  • 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. Commented Mar 17 at 17:12