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
