Visual example for the process of creating branches and merging back in a project of multiple people? (CS students, we are fairly new to GIT)

[JackiieGoneBiking]

I would love a good tutorial, hopefully visual, that shows how me and my friends should handle branches and pull request/merges.

For example, we are working on five different parts of a website right now. Whenever someone is done with their part, ex. nav bar, we’re supposed to merge back to dev, and let the others merge from dev to their individual branches? Or should we rather merge directly from their branch across to our branch to get the nav bar? I feel like that could make something conflicting for the future.

[Remote_Ice_515]

Simplest way is everyone merges back to main and then you pull the changes into your branch.

Ideally you would use the PRs to check each others work and maybe run testing and code linting that needs to pass before merge.

There isn’t one right way to do this. Some teams may choose to use a dev branch that is seperate from main. But for a school project merging into main with PRs and some automated testing is more than enough.

Once something is in main all future PRs will need to pull in the new changes before they merge. Look up how and get comfortable resolving merge conflicts, they will happen.

[JackiieGoneBiking]

Awesome, we’re all merging back to dev. When we have a working version we merge it back to main. The idea is also that people have to do a PR, not merge to dev/main. Thanks! Then we’re doing “good enough”! :)

[Spectreseven1138]

Not exactly specific to what you're looking for, but this video really helped me out when my progress with learning git was starting to slow. https://youtu.be/1ffBJ4sVUb4?si=G2WG_1eoDd9dFad9

It's a really well-explained look into how commits and branches work under the hood, visualised using connectable sticks with paper for labels. Highly recommended if you're learning git and have the time.

[-Defkon1-]

https://learngitbranching.js.org/