A space to discuss and keep up software development and manage your software career
An inclusive community for gaming enthusiasts
News and discussion of science and technology such as AI, VR, cryptocurrency, quantum computing, and more.
From composing and gigging to gear, hot music takes, and everything in between.
Discussing AI software development, and showing off what we're building.
A general discussion space for the Forem community. If it doesn't have a home elsewhere, it belongs here
Movie and TV enthusiasm, criticism and everything in-between.
Memes and software development shitposting
Web design, graphic design and everything in-between
A community of golfers and golfing enthusiasts
Your central hub for all things security. From ethical hacking and CTFs to GRC and career development, for beginners and pros alike
For engineers building software at scale. We discuss architecture, cloud-native, and SRE—the hard-won lessons you can't just Google
Discussing the core forem open source software project — features, bugs, performance, self-hosting.
A collaborative community for all things Crypto—from Bitcoin to protocol development and DeFi to NFTs and market analysis.
A place for parents to the share the joys, challenges, and wisdom that come from raising kids. We're here for them and for each other.
A community for makers, hobbyists, and professionals to discuss Arduino, Raspberry Pi, 3D printing, and much more.
Git switch - -detach origin/master
Git merge mybranch
Git commit
Git push origin HEAD:master
git checkout master git pull git merge mybranch git push
Seems simpler.
(Actually, for the second step, I use git up, which does pull --rebase=merges --autostash --prune for even more convenience)
Well I would not recommend this flow in general and suggest pull requests. However the main flow for not having master is optimized for is starting working. Instead of
Git switch master Git pull --ff-only Git switch -c mybranch
It is
Git fetch Git switch -c mybranch origin/master
Or
git fetch git rebase -i origin/master
instead of
git switch master git pull --ff-only git switch mybranch git rebase -i master
And if you must merge on master, but you don't have a local master.
Git fetch Git switch -c master origin/master
Are you sure you want to hide this comment? It will become hidden in your post, but will still be visible via the comment's permalink.
Hide child comments as well
Confirm
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.
Git switch - -detach origin/master
Git merge mybranch
Git commit
Git push origin HEAD:master
git checkout master
git pull
git merge mybranch
git push
Seems simpler.
(Actually, for the second step, I use git up, which does pull --rebase=merges --autostash --prune for even more convenience)
Well I would not recommend this flow in general and suggest pull requests. However the main flow for not having master is optimized for is starting working. Instead of
Git switch master
Git pull --ff-only
Git switch -c mybranch
It is
Git fetch
Git switch -c mybranch origin/master
Or
git fetch
git rebase -i origin/master
instead of
git switch master
git pull --ff-only
git switch mybranch
git rebase -i master
And if you must merge on master, but you don't have a local master.
Git fetch
Git switch -c master origin/master