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

Hannes Laimer h.laimer at proxmox.com
Wed Aug 7 14:11:02 CEST 2024


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.




More information about the pbs-devel mailing list