#git (2020-07)

All things git (except gitops)



Eric Berg avatar
Eric Berg

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.



RB avatar

anyone create a custom github homebrew tap in a private repo ? getting authorization errors

RB avatar
brew tap asks for git credentials · Issue #6679 · Homebrew/brew

ran brew update and can still reproduce the problem? ran brew doctor, fixed all issues and can still reproduce the problem? ran brew config and brew doctor and included their output with your issue…

pjaudiomv avatar

Have you tried using ssh brew tap group/repo ssh://[email protected]/group/team

pjaudiomv avatar

Then you could git clone the repo and brew install

pjaudiomv avatar

brew –cache -s appname can sometimes help to

RB avatar

No i haven’t but I’ll try this! Ty

Erik Osterman (Cloud Posse) avatar
Erik Osterman (Cloud Posse)

@Matt Gowie mentioned https://github.com/whalebrew/whalebrew - have you tried this?


Homebrew, but with Docker images. Contribute to whalebrew/whalebrew development by creating an account on GitHub.