On Monday, May 15, 2023 at 12:09:41 PM UTC-7 Dan Stromberg wrote: 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. I upgraded to git 2.40.1 using https://tecadmin.net/how-to-install-latest-git-on-ubuntu-22-04/ , but I'm still seeing the same problem. I suppose that means the problem stems from something in my commit history? Anyway, here's partial output from the script I posted (modified slightly to get the updated version of docker/requirements.txt.m4 from .. instead of /tmp) : + cp ../requirements.txt.m4 docker/. + git add docker/requirements.txt.m4 + git commit -m 'Dealt with merge conflicts' docker/requirements.txt.m4 [detached HEAD 50537f7] Dealt with merge conflicts 1 file changed, 3 insertions(+), 1 deletion(-) + git rebase --continue dropping 03004b1fb98ce23b134a250319f925e76a955b95 add git to prod images -- patch contents already upstream Auto-merging docker/requirements.txt.m4 CONFLICT (content): Merge conflict in docker/requirements.txt.m4 error: could not apply 921af1e... Merged conflict resolved hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 921af1e... Merged conflict resolved Does that say anything relevant? Thanks :) -- 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/5467f11d-672f-407f-8d28-7c57e60c5034n%40googlegroups.com.
