git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Yuri <yuri@tsoft.com>
To: Git Mailing List <git@vger.kernel.org>
Subject: 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: Thu, 17 Feb 2022 12:50:53 -0800	[thread overview]
Message-ID: <efdd752b-5cff-c483-80eb-654b53fdde7c@tsoft.com> (raw)

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


Yuri



             reply	other threads:[~2022-02-17 21:01 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-17 20:50 Yuri [this message]
2022-02-22 16:37 ` 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 Phillip Wood
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=efdd752b-5cff-c483-80eb-654b53fdde7c@tsoft.com \
    --to=yuri@tsoft.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. 
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).