From: Achim Gratz <Stromeko@nexgo.de>
To: cygwin-patches@cygwin.com
Subject: Re: [PATCH] winsup/doc/dll.xml: update MinGW/.org to MinGW-w64/.org
Date: Mon, 08 Mar 2021 20:09:08 +0100 [thread overview]
Message-ID: <87lfax8nu3.fsf@Rainer.invalid> (raw)
In-Reply-To: <70c973ec-f8c7-f5cc-1d38-f0306b8521c2@SystematicSw.ab.ca> (Brian Inglis's message of "Mon, 8 Mar 2021 11:19:30 -0700")
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.
Regards,
Achim.
--
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+
Factory and User Sound Singles for Waldorf Blofeld:
http://Synth.Stromeko.net/Downloads.html#WaldorfSounds
next prev parent reply other threads:[~2021-03-08 19:09 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 [this message]
2021-03-08 20:20 ` Ken Brown
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=87lfax8nu3.fsf@Rainer.invalid \
--to=stromeko@nexgo.de \
--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).