From: Ken Brown <kbrown@cornell.edu>
To: cygwin-patches@cygwin.com
Subject: Re: [PATCH] winsup/doc/dll.xml: update MinGW/.org to MinGW-w64/.org
Date: Mon, 8 Mar 2021 15:20:39 -0500 [thread overview]
Message-ID: <b81497ce-72d0-f11e-a381-568aa407b98a@cornell.edu> (raw)
In-Reply-To: <87lfax8nu3.fsf@Rainer.invalid>
On 3/8/2021 2:09 PM, Achim Gratz wrote:
> Brian Inglis writes:
>> It's normally a merge conflict which will not be satisfied by regular
>> commands to restore the working files to upstream.
>
> So you're pulling on an unclean work tree? That's a no-no, either keep
> your changes on a separate branch (that you can rebase or merge later)
> or stash them away for the pull.
>
> As Corinna said, if you're prepared to lose any local changes then
>
> git reset --hard
>
> will do that. But you should be sure you really didn't want any of your
> unfinished business around any more.
If the unfinished business consists of local commits that haven't yet been
applied upstream, then I typically do the following:
git fetch # Find out if upstream has changed since my last pull. If so...
git format-patch -n # save n local commits
git reset --hard origin/master
git am 00* # reapply my local commits
This assumes I've been too lazy to work on a separate branch, which is often the
case for small changes.
Ken
next prev parent reply other threads:[~2021-03-08 20:21 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-07 16:31 Brian Inglis
2021-03-07 19:15 ` Jon Turney
2021-03-07 20:26 ` Brian Inglis
2021-03-08 10:14 ` Corinna Vinschen
2021-03-08 17:32 ` Brian Inglis
2021-03-08 17:38 ` Achim Gratz
2021-03-08 18:19 ` Brian Inglis
2021-03-08 19:09 ` Achim Gratz
2021-03-08 20:20 ` Ken Brown [this message]
2021-03-08 20:52 ` ASSI
2021-03-08 20:55 ` Corinna Vinschen
2021-03-09 6:08 ` Brian Inglis
2021-03-08 10:13 ` Corinna Vinschen
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=b81497ce-72d0-f11e-a381-568aa407b98a@cornell.edu \
--to=kbrown@cornell.edu \
--cc=cygwin-patches@cygwin.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.
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).