From: "Jean-Noël Avila" <avila.jn@gmail.com>
To: Loic Fouray <loic@yeplaa.net>, git@vger.kernel.org
Subject: Re: Merge conflict when lines next to each other are changed
Date: Fri, 3 Dec 2021 08:13:43 +0100 [thread overview]
Message-ID: <78fd768d-6248-556c-4b74-7e35bb09a197@gmail.com> (raw)
In-Reply-To: <A5C94370-A9D0-43B2-9B32-0935703BCC94@yeplaa.net>
Le 01/12/2021 à 10:30, Loic Fouray a écrit :
> 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
next prev parent reply other threads:[~2021-12-03 7:13 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-01 9:30 Merge conflict when lines next to each other are changed Loic Fouray
2021-12-01 12:18 ` rsbecker
2021-12-01 13:33 ` Loic Fouray
2021-12-01 14:09 ` rsbecker
2021-12-03 16:30 ` Loic Fouray
2021-12-03 16:52 ` rsbecker
2021-12-03 7:13 ` Jean-Noël Avila [this message]
2021-12-03 13:31 ` Loic Fouray
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=78fd768d-6248-556c-4b74-7e35bb09a197@gmail.com \
--to=avila.jn@gmail.com \
--cc=git@vger.kernel.org \
--cc=loic@yeplaa.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).