Date: Tue, 23 Jan 2024 19:20:07 +0100 From: Mathieu Arnold <mat@freebsd.org> To: Christian Weisgerber <naddy@mips.inka.de> Cc: freebsd-git@freebsd.org Subject: Re: Force merge conflicts? Message-ID: <e53efg54xnxf44gzgmidbg2xt2l44nzmhyf3mxyf5q7znpptwy@3dujcp225dnm> In-Reply-To: <Za_SdBnXJkerj8gF@lorvorc.mips.inka.de> References: <Za_SdBnXJkerj8gF@lorvorc.mips.inka.de>
next in thread | previous in thread | raw e-mail | index | archive | help
--d6h6awwtzsobfxx6 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Jan 23, 2024 at 03:51:32PM +0100, Christian Weisgerber wrote: > Is there a way to tell git to create a conflict when two branches > have the same change? I had a look and Git conflicts' resolution does not seem to be able to do that. For Git, when you merge two files that have the same change, then it assumes that it is the same change and is happy with it. For the case you are talking about, I would either: - Defer the PORTREVISION bump to when the branch is ready to be merged, and automate it with one of the scripts in Tools. - Bump PORTREVISON and add a comment on the same line with, say, `# TODO: remove me` so that it forces a conflict to arise and mechanically remove them before merging. --=20 Mathieu Arnold --d6h6awwtzsobfxx6 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQITBAABCgB9FiEE9XJBpJetWizkEBUef2IOCp6dQb4FAmWwA1ZfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEY1 NzI0MUE0OTdBRDVBMkNFNDEwMTUxRTdGNjIwRTBBOUU5RDQxQkUACgkQf2IOCp6d Qb4m5AwAm+voGtFVLI/XHcygYWPwFdEbvLuWit0QQgJoJbHlewhxrj10b7ETAyVz geB7Z95KERoc3llvvJkYVqDgyETcokmKHGuviLyNnYwyxluWVzwyQu8hCjBaSXMa 0Jg4/xwcs6jF37jxd2xm0y9YI6Xvpfof+s3KGmlX6Fs3mPCwXvOl1CSpgbOhHKI2 KPjU7paqTKdq0i90/ANo9OdDsDAa7fQhTv9qxwzlTQcvgpKkOECiV2RGwYMofVHc LPsbJHGdZIq+eEmF+3tpLoBU+ay6nRC8JBc8PowkwV8ambs+uib84LUOVxn3ZLZO zsqwXu1ez8WUoZhrjKtszVZaPICntLKS0I89528f/15t2Vkrup4ig0jzrg2Y1rV7 7XGOVBMJDXdQw+LhcUUAb7yJ/nixFogF/fKjjy9TC4a4NJSNn4sqiIk0PLTaD2Cz UPwgheN6/XypU8ceriLtNzfy3nvGsGOed1gbZ3ejG0lFvExmb92kyGgzZMP/VRPu 9KdKlVoa =jolS -----END PGP SIGNATURE----- --d6h6awwtzsobfxx6--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?e53efg54xnxf44gzgmidbg2xt2l44nzmhyf3mxyf5q7znpptwy>