Re: Force merge conflicts?

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.

-- 
Mathieu Arnold