Long time software architect, CTO Authress, creating application security plug-ins for any software application with Authress. Talk to me about security in microservices or service authorization.
By default your local branch master is set to track changes from origin. However what you really want is master tracking changes from upstream. So I'm just suggesting to ignore origin/master as a mindset shift, and then everything works out as you would expect. Sure your remote origin/master is wrong, but who cares.
For further actions, you may consider blocking this person and/or reporting abuse
We're a place where coders share, stay up-to-date and grow their careers.
wow :O I have to try this, not grasped it ...
master branch fetched from origin, why I'd fetch from origin?By default your local branch
masteris set to track changes fromorigin. However what you really want ismastertracking changes fromupstream. So I'm just suggesting to ignoreorigin/masteras a mindset shift, and then everything works out as you would expect. Sure your remoteorigin/masteris wrong, but who cares.