git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Phillip Wood <phillip.wood123@gmail.com>
To: Yuri <yuri@tsoft.com>, Git Mailing List <git@vger.kernel.org>
Subject: Re: When rebase.autoStash=true is used, 'git pull' merge process still complains when incoming changes are in a different place of the file than local changes
Date: Tue, 22 Feb 2022 16:37:44 +0000	[thread overview]
Message-ID: <3101d7c2-c78c-1f96-a7c6-08979d8f246b@gmail.com> (raw)
In-Reply-To: <efdd752b-5cff-c483-80eb-654b53fdde7c@tsoft.com>

Hi Yuri

On 17/02/2022 20:50, Yuri wrote:
> I have a file "x" that has one local change and some incoming pulled 
> changes.
> 
> Pulled changes are contextually very far away, so it should be possible 
> to merge them without user interaction.
> 
> But git still complains:
> 
> $ git pull
> Updating 91bfe02..522ccf2
> error: Your local changes to the following files would be overwritten by 
> merge:
>      x

pull only uses rebase.autoStash if you ask it to rebase, if it is trying 
to merge then you need to pass --autostash on the command line or set 
merge.autoStash (assuming you want merge to always use --autostash).

Best Wishes

Phillip

> 
> Yuri
> 
> 

  reply	other threads:[~2022-02-22 16:37 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-17 20:50 When rebase.autoStash=true is used, 'git pull' merge process still complains when incoming changes are in a different place of the file than local changes Yuri
2022-02-22 16:37 ` Phillip Wood [this message]
2022-02-23 21:23   ` Junio C Hamano

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=3101d7c2-c78c-1f96-a7c6-08979d8f246b@gmail.com \
    --to=phillip.wood123@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=phillip.wood@dunelm.org.uk \
    --cc=yuri@tsoft.com \
    /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).