From: Brian Inglis <Brian.Inglis@SystematicSw.ab.ca>
To: cygwin-patches@cygwin.com
Subject: Re: [PATCH] winsup/doc/dll.xml: update MinGW/.org to MinGW-w64/.org
Date: Mon, 8 Mar 2021 11:19:30 -0700 [thread overview]
Message-ID: <70c973ec-f8c7-f5cc-1d38-f0306b8521c2@SystematicSw.ab.ca> (raw)
In-Reply-To: <87pn098s1j.fsf@Rainer.invalid>
On 2021-03-08 10:38, Achim Gratz wrote:
> 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
It's normally a merge conflict which will not be satisfied by regular commands
to restore the working files to upstream.
> git remote update
>
> to get the objects and then figure out how to pull the branch.
Thanks for that last tip which is the first I have heard of that command.
--
Take care. Thanks, Brian Inglis, Calgary, Alberta, Canada
This email may be disturbing to some readers as it contains
too much technical detail. Reader discretion is advised.
[Data in binary units and prefixes, physical quantities in SI.]
next prev parent reply other threads:[~2021-03-08 18:19 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 [this message]
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=70c973ec-f8c7-f5cc-1d38-f0306b8521c2@SystematicSw.ab.ca \
--to=brian.inglis@systematicsw.ab.ca \
--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).