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 18:38:16 +0100 [thread overview]
Message-ID: <87pn098s1j.fsf@Rainer.invalid> (raw)
In-Reply-To: <b62c52a0-fee4-4cc4-bb57-e16169239d9a@SystematicSw.ab.ca> (Brian Inglis's message of "Mon, 8 Mar 2021 10:32:54 -0700")
Brian Inglis writes:
> Thanks - I'll try to remember to try that - on a pull conflict I
> normally try to checkout -- file(s), then -f, then origin/master, then
> plus -f, with status checks between, then commit -m merge when
> required, and re-pull origin/master to check resynced to upstream
> remote.
git status
That usually tells you what it is that prevents pulling. Aside from
that, you can always do
git remote update
to get the objects and then figure out how to pull the branch.
Regards,
Achim.
--
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+
Samples for the Waldorf Blofeld:
http://Synth.Stromeko.net/Downloads.html#BlofeldSamplesExtra
next prev parent reply other threads:[~2021-03-08 17:38 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 [this message]
2021-03-08 18:19 ` Brian Inglis
2021-03-08 19:09 ` Achim Gratz
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=87pn098s1j.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).