From nobody Tue Jan 23 18:20:07 2024 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKFkM3C5vz57qL1 for ; Tue, 23 Jan 2024 18:20:11 +0000 (UTC) (envelope-from mat@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TKFkM2fGMz4JNP; Tue, 23 Jan 2024 18:20:11 +0000 (UTC) (envelope-from mat@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706034011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ltAIBpz7rYL2lUdFB7sNcm5R3atFixwNB2SI37JkhLs=; b=iOxlX3OzUBdM+NBorZIDpRLQz+JErC1HKjzt1riIBPmAQE1v2FuiGlJGoXGu/CyfEFfLWS C7i/dV3XX1e41i7o3+f3psZtB906zQtfvcqPUb0LIp8dIsmjHBHLGMU3bFAveWuL2uGq1f QeEplR76pnWSYlvqKfopHKLhXFRJ/6AUnpTwfDWf4caJ4oDc6syZTqKQDfhWr6uZpSpeaG RN4KJxPwchf6kWNlBnwOZEAWbGVQTWYXT6/EIS1ahTgOE1+sbc5W/OfuZ5JiX42FrL1F9C eapk3ZOgDBFOZ6eiI+QqGznG+4afUjEa9nAroz2Fl5rBrBNtSSfBtXWKKiOncQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706034011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ltAIBpz7rYL2lUdFB7sNcm5R3atFixwNB2SI37JkhLs=; b=kV549wpaPuoiBsmsN4gcq05xqzdqYZ4B63dITjyjJYCPb/IN0wuRK1MiR6YsorliD8WNFy q53l57DwhM+TqJ8ViMITRnMB5+fotyuMrCt8lXbOYbosvB4cN3rKmelsH6LDbrIS85bU8P btFEAOHVrav1MSiYx/vaiQlG1sXRKE0oRECBGy+DZT6c1A99pWtaaDI9tV1DEzWdI4wfvL MO0kiv9BOp2umo+/1KDrUNSMUlIbR224yl5XpBo3Bt5byK0uuX9U4u1r9sIdF3MOVrtaDx graqMmxPhi4706v3ORbY0RUtfUB0mbrOFV+ZXljOPqZnPFX2z5mZy5UCmXZzxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706034011; a=rsa-sha256; cv=none; b=jzDphxAnmmREUSl/P6iJ2hW9/wZyJsGdTdsvzJI4rm5V2tiBQH6WqoyoYXc7ENKspyHNXD ATyca1HU6yOKGX8OR3pzGLQCiWC/koOsEtat0XE0N1z65P43ZiE1fm84kUVVRKhG+tfUqa v9xocJRLI25Uel38v3LExyt12NQGAYNcHNUx4gZ2U+hI5MhfsmGzhm5OwuhVyQBl7yjOo7 Go0ZOsDWLYacHL3umbrzULj4SKxsYw1yQ89sT0xOEjo9yOPFuuX4A5Y1WDiJzfgEBt14fn awGPGUGBEoLXhYnMxxy9MiutUQSX7i0oDKNJjxcfbJZr5RpB71FVC1GgMdDGiw== Received: from relay.mat.cc (cow.mat.cc [IPv6:2a01:678:2:200::49]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "cow.mat.cc", Issuer "R3" (verified OK)) (Authenticated sender: mat/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TKFkM0xjhz1Nly; Tue, 23 Jan 2024 18:20:11 +0000 (UTC) (envelope-from mat@freebsd.org) Received: from aching.in.mat.cc (unknown [IPv6:2a01:e0a:836:f670:1073:8017:b029:e606]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by relay.mat.cc (Postfix) with ESMTPSA id 9E6291FDBC; Tue, 23 Jan 2024 19:20:09 +0100 (CET) Date: Tue, 23 Jan 2024 19:20:07 +0100 From: Mathieu Arnold To: Christian Weisgerber Cc: freebsd-git@freebsd.org Subject: Re: Force merge conflicts? Message-ID: References: List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="d6h6awwtzsobfxx6" Content-Disposition: inline In-Reply-To: --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--