[pbs-devel] [PATCH proxmox-backup] datastore: simplify update-datastore-cache socket command

[Lukas Wagner]

On  2024-08-07 14:11, Hannes Laimer wrote:
> On Wed Aug 7, 2024 at 11:41 AM CEST, Lukas Wagner wrote:
>> On  2024-08-05 15:19, Hannes Laimer wrote:
>>> ping, still applies, and makes the logic more explicit and straight
>>> forward
>>>
>>
>> Does not apply cleanly for me anymore :) (needs git am -3)
> 
> Is 3way merge considered less clean? I mean, in my head "applies cleanly" <=> "no
> conflicts", but maybe I'm missing something. I can send it again after
> applying it with 3way merge and creating a new patch file.

I would say for smaller stuff a 3-way merge on reviewer/applier side is fine, but for
bigger patches it's nicer if it can be merged without it. It gives me the assurance
that everything is applied just the way you tested it and want it to be.
There is always the chance that a 3-way merge introduces slight changes in behavior/
subtle bugs.

But that's just my 2ct on this, maybe others see this differently 🙂 .

-- 
- Lukas