From: Julia Evans Date: Fri, 02 Oct 2026 17:39:44 GMT Subject: Re: [PATCH 0/7] [doc] Add new page on merge conflicts Message-ID: <91396552-f86b-47d7-9805-8f6056c2ed66@app.fastmail.com> In-Reply-To: Thanks for the review! >> * I wrote that git commit does the same thing as git merge --continue >> during a git merge , but I'm not sure if that's always true. > > See also discussion in > https://lore.kernel.org/git/CABPp-BEQSx4m3BcT28CpVGCtsH75+x3gmv4OJz_ecLVLx+kBWg@mail.gmail.com/T/#t Wow, that's a very interesting read. I'm more informed than I was before I read it but also at the same time more confused :). It makes me think that "git commit does the same thing as git merge --continue" is maybe not true but also I don't know what the difference might be. I've put an item on my TODO list to remove `git commit does the same thing as git merge --continue`" and to try to replace it with a more vague sentence that I guess says you can use either command without being so specific on whether they are exactly the same. >> Also if/when the git rebase --squash changes land, then we'd need >> to add git history to this list. > > I imagine you meant history squash? I also thought that history had > punted on how to deal with conflicts (rejecting any operation which > creates them) for now, since we don't have 1st-class conflicts à la > Jujutsu. Good to know! Removed this from my v2 cover letter draft.