All of lore.kernel.org
 help / color / mirror / Atom feed
From: Loic Fouray <loic@yeplaa.net>
To: "Jean-Noël Avila" <avila.jn@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Merge conflict when lines next to each other are changed
Date: Fri, 3 Dec 2021 14:31:22 +0100	[thread overview]
Message-ID: <F3B50D52-01B2-4EFA-A107-311E215FB518@yeplaa.net> (raw)
In-Reply-To: <78fd768d-6248-556c-4b74-7e35bb09a197@gmail.com>

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 <avila.jn@gmail.com> a écrit :
> 
> 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
> 

      reply	other threads:[~2021-12-03 13:31 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
2021-12-03 13:31   ` Loic Fouray [this message]

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=F3B50D52-01B2-4EFA-A107-311E215FB518@yeplaa.net \
    --to=loic@yeplaa.net \
    --cc=avila.jn@gmail.com \
    --cc=git@vger.kernel.org \
    /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. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.