From: "Hannes Laimer" <h.laimer@proxmox.com>
To: "Lukas Wagner" <l.wagner@proxmox.com>,
"Proxmox Backup Server development discussion"
<pbs-devel@lists.proxmox.com>
Subject: Re: [pbs-devel] [PATCH proxmox-backup] datastore: simplify update-datastore-cache socket command
Date: Wed, 07 Aug 2024 14:11:02 +0200 [thread overview]
Message-ID: <D39O3PS699YC.38P5NW6BH6X0T@proxmox.com> (raw)
In-Reply-To: <80616576-4d8b-4c8d-b5cc-fb48be9456a2@proxmox.com>
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.
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
next prev parent reply other threads:[~2024-08-07 12:10 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-02 12:29 Hannes Laimer
2024-08-05 13:19 ` Hannes Laimer
2024-08-07 9:41 ` Lukas Wagner
2024-08-07 12:11 ` Hannes Laimer [this message]
2024-08-07 12:19 ` Lukas Wagner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=D39O3PS699YC.38P5NW6BH6X0T@proxmox.com \
--to=h.laimer@proxmox.com \
--cc=l.wagner@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox