DEV Community

Discussion on: Open Source: My first Pull Request

Collapse
 
tugrul profile image
Tuğrul Topuz • Edited

You can choose merge on github then use git stash command and pull from remote repository then git stash pop is fluent then your approach. Consider you have 5 collegue and they pushed so many commits. Manual operation is a bit pain in this scenario

Collapse
 
okimotomizuho profile image
MizuhoOkimoto

Hi Tuğrul! Thank you for your comment and advice! I didn't know about git stash command 👀 Sounds tough if many people push many commits... I will try to use the command next time!

Collapse
 
tugrul profile image
Tuğrul Topuz

Hi Mizuho. You're welcome. Git is powerful and it has more tools in their toolbox. So interactive rebase is another good feature. You can edit entire history of commits but there is a vital point while making changes on. Commit history should not propagated your coworkers or you have to make plan and sync commit history all together with your coworkers

Thread Thread
 
okimotomizuho profile image
MizuhoOkimoto

Git is very interesting, but I'm still afraid of working on it with other people. I hope I can be a git manster😆 Thank you for the informative information!