On Monday, May 15, 2023 at 11:17:36 AM UTC-7 Konstantin Khomoutov wrote:
On Thu, May 11, 2023 at 11:02:44AM -0700, Dan Stromberg wrote: > I put together this little script to show what I'm seeing. > > The comments pretty much say what's going on. But in summary, how can I > get the merge conflict to go away? I'm surprised that the > add+commit+rebase --continue isn't enough to deal with that file. Hi, Dan! Hi Konstantin. I cannot reproduce it on Linux/amd64 with Git 2.39.2 Maybe I should try upgrading. I'm using git version 2.34.1 on an Ubuntu 22.04.1 LTS virtual machine. Thanks for the response! -- 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/cd2d7c22-1adf-4a7c-8325-67a20ae91b1an%40googlegroups.com.
