#git (2020-07)
All things git (except gitops)
2020-07-07
2020-07-21
I have a branch on which I have a significant amount of change that I want to “merge” back to master, but I want that branch to replace what’s in master now, not merge into it. I think I can use the following to accomplish that for merging mybranch into master:
git checkout master
git merge -s theirs mybranch
I have also seen it suggested that i merge master into mybranch into master first, using -s ours and then merge mybranch into master.
Recommendations?
2020-07-23
anyone create a custom github homebrew tap in a private repo ? getting authorization errors
this is the issue im having https://github.com/Homebrew/brew/issues/6679
Have you tried using ssh brew tap group/repo ssh://[email protected]/group/team
Then you could git clone the repo and brew install
brew –cache -s appname can sometimes help to
No i haven’t but I’ll try this! Ty
@Matt Gowie mentioned https://github.com/whalebrew/whalebrew - have you tried this?