Date: Tue, 5 Mar 2024 22:46:02 +0000 (UTC) From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: freebsd-git@freebsd.org Subject: vendor imports beyond the committers guide? Message-ID: <n4p4714r-2n97-psq3-34p2-887qq0o1354q@SerrOFQ.bet>
next in thread | raw e-mail | index | archive | help
Hi, there's the edge case when we already have code in contrib which was previously directly committed and now should come out of a vendor branch. (1) how does one properly seed that case? (2) given I couldn't see that mentioned either anywhere, for local changes, they only live in main and stable/ but vendor doesn't have them so in case of conflict they'll show up with the merge from vendor to main and need to be resolved then? /bz -- Bjoern A. Zeeb r15:7
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?n4p4714r-2n97-psq3-34p2-887qq0o1354q>