[PATCH] winsup/doc/dll.xml: update MinGW/.org to MinGW-w64/.org

Brian Inglis Brian.Inglis@SystematicSw.ab.ca
Mon Mar 8 18:19:30 GMT 2021


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.]


More information about the Cygwin-patches mailing list