git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] pull: conflict hint pull.rebase suggestion should offer "merges" vs "true"

From
Elijah Newren <newren@gmail.com>
Date
Feb 28, 2023, 02:35 UTC
Message-ID
<CABPp-BHVLx+wikxsJqDjFM416PoC6CY-5L7RQDqJAdU7kOeDyA@mail.gmail.com>
In-Reply-To
<87pm9v6n9a.fsf@osv.gnss.ru>
Note: I'm not talking about rebasing merges anymore in this thread,
but I thought there was a useful how-we're-communicating subthread
that's worth addressing to see if we can make that part work better...
On Mon, Feb 27, 2023 at 9:17 AM Sergey Organov <sorganov@gmail.com> wrote:
Show 19 quoted lines
>
> Elijah Newren <newren@gmail.com> writes:
>
> > On Sun, Feb 26, 2023 at 1:29 AM Sergey Organov <sorganov@gmail.com> wrote:
> >>
> >> Elijah Newren <newren@gmail.com> writes:
> >>
> >> > On Sat, Feb 25, 2023 at 7:15 AM Sergey Organov <sorganov@gmail.com> wrote:
> >> >>
> >> >> Elijah Newren <newren@gmail.com> writes:
> >> >>
> >> >> > On Fri, Feb 24, 2023 at 2:06 PM Sergey Organov <sorganov@gmail.com> wrote:
> >> >> >>
> >> >> >> Elijah Newren <newren@gmail.com> writes:
> >> >>
> >> >> [...]
> >> >>
> >> >> > Please, go read at least [1] to see Johannes comments about how the
> >> >> > prior proposals don't work beyond simple cases.
[...]
Show 10 quoted lines
> >> Except the method discussed does achieve exactly that according to the
> >> evidence gathered at the time of debates, and here is confirmation (from
> >> Johannes himself) from the reference you provided:
> >
> > I'm glad you read it.  :-)
>
> In fact I didn't read it, I rather re-read it ;-)
>
> (I'm in the CC list there, so it should not have been a surprise I did
> read it then.)

I knew you were on the CC, I just didn't believe at the time that you could have read that email and still claimed that "As for Dscho results specifically, I've got an impression that he never needed rebasing of merges in the first place", so I assumed you had skipped that email or only lightly skimmed it.

I'm still quite surprised, but clearly my assumption that you read the email was wrong. Sorry about that.

Show 12 quoted lines
> >> Setting this back into perspective, in comparison to blind re-merge,
> >> that fails to keep user changes even when no conflicts at all exist, and
> >> even when it's applied at the same place in the history, the discussed
> >> method is a *huge* step forward, especially if re-merge is kept as a
> >> fallback strategy.
> >
> > The use of superlatives and asterisks doesn't change my opinion; I'm
> > still skeptical that the given strategy is overall a step forward, let
> > alone a large one.
>
> You just repeat saying the same thing, without any further arguments?
> OK, thank you for your opinion anyway.

That exactly mirrors how I've felt about your emails in this thread. You are right that I'm not going into detail either...but why would I?

  * I'm not trying to convince you to implement these ideas or change
your own implementation, especially since:
  * You've previously said you aren't even planning on working on this[1].

Of course, you can easily ask why I would think you might provide details when I was not providing any. Well, from my viewpoint:

  * You did say you were hoping someone else would work on this
problem[1,2,& end of this email], and I've expressed interest in
working on the problem space.
  * If you want someone to work on your ideas, using your particular
favored approach, for free, then you need to convince them that your
approach is worth investing in
  * I have read the old proposals, in detail, and stated I don't
believe in them.
  * You didn't try to address my concerns beyond simply reasserting
that the ideas in the original proposals were good, and seemed to be
more interested in discrediting or minimizing my concerns (e.g. asking
why I "hated diffs from merge to either parent") than in learning
about or addressing them.

I think your intentions are good (you're trying to solve a big problem in Git), I'm just a little worried about the execution (e.g. brushing aside my concerns so folks won't pay attention to them while actively recruiting eager contributors, with the plan to send them down what I believe is a dead-end path). If it was just you going down this path, I wouldn't be so concerned. Personally, I pursue a *lot* of my own bad ideas, and learn in the process that they were bad. Also, if you showed some willingness to entertain that I might be right that the old proposals are bad, and could communicate that to new contributors and let them decide, I would have dropped out of the thread sooner and just let you do your thing.

The way you've responded in this thread doesn't seem unique to our interactions; it reminds me of an interaction you had with Junio at [3]. He suggested there were some code issues. You could have asked what they were and maybe learned how to improve things. Or maybe you could have learned that he just had a specific misunderstanding which could have been corrected if you asked some questions to find out what he was thinking. Instead, you simply asserted that things were fine and dismissed his concerns. I think it was a lost opportunity.

Now, it's fully possible here that I've misunderstood your purpose; if so, I apologize. The above was the understanding I was working off of; maybe knowing that will help you understand my responses.

[1] stated in final paragraph of https://lore.kernel.org/git/87zgkh9buq.fsf@osv.gnss.ru/ [2] hinted at in final paragraph of https://lore.kernel.org/git/87bklilnvp.fsf@osv.gnss.ru/ [3] https://lore.kernel.org/git/87wna3jwx8.fsf@osv.gnss.ru/

Show 5 quoted lines
> > (I do agree we have a huge problem and thus that a huge step forward
> > theoretically could be taken, I just don't see this as it.)
>
> It works. Really.
>
Show 7 quoted lines
> > But I've stated that more than enough, and no one is producing patches
> > on this topic right now, so I'll drop out of this thread.
>
> OK, I participate only in hope that there will be somebody who actually
> cares enough to implement it. Maybe it will be me, maybe not, and I
> already got it that neither you nor the original author of git-rebase
> are interested.

Correct, I'm not interested in implementing it that particular way, though I will be implementing it in what I feel is the right way.

Anyway, I hope something I said above helps in some way. Even if not, I wish you the best of luck on your efforts.

Previous: Sergey OrganovNext: Elijah Newren
Message 23 of 34 in “pull: conflict hint pull.rebase suggestion should offer "merges" vs "true"”
  1. pull: conflict hint pull.rebase suggestion should offer "merges" vs "true"Tao Klerks via GitGitGadget, Feb 5, 2023
  2. Alex HenrieFeb 16, 2023
  3. Tao KlerksFeb 16, 2023
  4. Alex HenrieFeb 17, 2023
  5. Tao KlerksFeb 17, 2023
  6. Alex HenrieFeb 17, 2023
  7. Junio C HamanoFeb 17, 2023
  8. Elijah NewrenFeb 18, 2023
  9. Phillip WoodFeb 18, 2023
  10. Tao KlerksFeb 20, 2023
  11. Phillip WoodFeb 20, 2023
  12. Elijah NewrenFeb 20, 2023
  13. Tao KlerksFeb 21, 2023
  14. Sergey OrganovFeb 22, 2023
  15. Elijah NewrenFeb 24, 2023
  16. Sergey OrganovFeb 24, 2023
  17. Elijah NewrenFeb 24, 2023
  18. Sergey OrganovFeb 25, 2023
  19. Elijah NewrenFeb 25, 2023
  20. Sergey OrganovFeb 26, 2023
  21. Elijah NewrenFeb 27, 2023
  22. Sergey OrganovFeb 27, 2023
  23. Elijah NewrenFeb 28, 2023
  24. Elijah NewrenFeb 20, 2023
  25. Tao KlerksFeb 20, 2023
  26. Elijah NewrenFeb 20, 2023
  27. Alex HenrieFeb 20, 2023
  28. Tao KlerksFeb 21, 2023
  29. Alex HenrieFeb 21, 2023
  30. Tao KlerksFeb 21, 2023
  31. Elijah NewrenFeb 24, 2023
  32. Felipe ContrerasFeb 28, 2023
  33. Alex HenrieFeb 28, 2023
  34. Felipe ContrerasMar 1, 2023

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.