Re: Merge conflict when lines next to each other are changed

Hi,

Thanks Jean-Noël for your reply.

When you create a custom merge driver on a specific file, do you know if It possible to apply it only on a part of the file and apply also the standard merge strategy on this file ? 
The purpose would be to able to identify other merge conflits if this is the case …
I don’t think that is possible..

Loïc 

Envoyé de mon iPhone

Le 3 déc. 2021 à 08:13, Jean-Noël Avila [off-list ref] a écrit :

Le 01/12/2021 à 10:30, Loic Fouray a écrit :

quoted

Hi,

In a file, I have this 2 lines one below the other:

Repository: myvalue
Tag: 8.2.10

On my local branch i have updated repository myvalue.
On the upstream repo, they updated often the tag value (not updated of my side).

When i perform a merge from upstream to local branch, i have a conflit. 
It seems that it’s related to neighboring lines. 
Could you confirm that it ‘s a normal git operation?

Also, i need to automate this merge. Is It possible with git tools to avoid this conflict or to resolv this conflict automatically?

Thanks for tour help
Loïc 

Hi,

This is a use-case for git attribute "merge" :

https://git-scm.com/docs/gitattributes#_performing_a_three_way_merge


BR


Jean-Noël