Re: [RFC] Rebasing merges: a jorney to the ultimate solution(RoadClear)

Hi Sergey,

On Fri, 30 Mar 2018, Sergey Organov wrote:

No.

The expectation of users as to what a `pick` is has not changed just because you wish it would.

That is a matter of backwards-compatibility.

You see, if you are driving a car for a hundred years already, and then switch to a different car, and it has a lever in the same place as your previous car's windshield wiper, but in the new car it has a button that activates the emergency driver seat ejection OMG *it has a seat ejection like in the James Bond movies! Where can I get that car?* Sorry for disgressing.

I am really concerned about that willingness to put an innocuous button, so to speak, onto something users got really used to, over the course of a decade or so, when that button should really be made red and blinking and OMG where can I get that car?

So to reiterate, I am really interested in a practical solution that won't cause nasty surprises. Meaning: `pick` != merge. That was a mistake in preserve-merges, as I have only mentioned like a hundred times, and we won't repeat it.

Now back to that important question: where can I get such a James Bond car? Ideally also with Turbo Boost. Oh wait, that was somebody else's car.

Ciao, Johannes