Two clarifications - On Tue, May 16, 2023 at 03:46:27PM +0300, Konstantin Khomoutov wrote: [...] > Ah, that might indeed easily explain the observed behavior: `git rebase` > textually applies each commit from those your branch has compared to the > "base" branch, one-by-one, and each application may fail due to conflicts.
"Textually" means that the changes introduced by a commit are tried to be applied as a textual patch represneting those changes - basically, as if you'd do `git show` on that commit followed by `git apply` of its results. > (I cannot fathom any non-far-fetched reason to commit a file which is in a > conflicting state) I mean, by default Git inserts the so-called conflict markers into each text file with conflicts - changing the contents of those files in a way that "breaks" the syntax of such contents. To bring an example, a Dockerfile with conflict markers won't be successfully processed by `docker build`. Hence I fail to see what such committing would be useful for - except as a way to "transfer" such conflicting state somewhere a human being would deal with the conflicts, thus restoring the syntactic correctness of the files involved. -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/git-users/20230516151005.4sjahvf7kj3r44wr%40carbon.
