Some git links that helped me
Posted by jpluimers on 2017/08/08
For my link archive:
- Merge local master branch with remote master branch in Git – Stack Overflow [WayBack]: fetch, rebase, merge.
- git: fetch and merge, don’t pull | Mark’s Blog [WayBack]
- How do I push a local Git branch to master branch in the remote? – Stack Overflow [WayBack]: dirty, but $
git push origin develop:masteror$ git push <remote> <local branch name>:<remote branch to push into>can save your ass - git pull keeping local changes – Stack Overflow [WayBack]: stash, stash pop, git checkout –theirs — config.php (note
theirsandourscan be very confusing). - : .gitattributes with merge=ours for some files
–jeroen
The Wiert Corner - irregular stream of stuff 
Leave a comment