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.
I have one question. For example, I am working on the dev branch. Meanwhile, my colleague has pushed 2 more commits. What should I do? Should I pull first then commit or should I commit first and then pull? I am always confused over here.
You cannot pull before commit because git does not know what do with changes in local.
This is what we do.
if you dont want to commit ur changes and still you want to pull data you do stash
stash will push changes to stack and you can get it from it later or you can auto stash
git pull --rebase --auto-stash
Thank you so much for the answer. Very Helpful!
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.
I have one question.
For example, I am working on the dev branch. Meanwhile, my colleague has pushed 2 more commits.
What should I do? Should I pull first then commit or should I commit first and then pull?
I am always confused over here.
You cannot pull before commit because git does not know what do with changes in local.
This is what we do.
if you dont want to commit ur changes and still you want to pull data you do stash
stash will push changes to stack and you can get it from it later or you can auto stash
git pull --rebase --auto-stash
Thank you so much for the answer. Very Helpful!