DEV Community

Discussion on: First Collab Project, Need Help With Github Workflow!

 
andreajasper profile image
Andrea

Yes, you'd need to create a staging branch that you can both push too to ensure it works before going to main. Your partner could also merge your current branch into his using the commands you listed above. It shouldn't overwrite any of his work, just add yours code to his. If there are conflicts, his code editor should notify him. :)

Thread Thread
 
tyrellcurry profile image
Tyrell Curry

Awesome!!! Once again, thank you tons Andrea! You’ve pretty much solved our collaboration worries :).

Thread Thread
 
andreajasper profile image
Andrea

Yay! I'm so glad I could help. :) Best of luck on your project.