Collaborating using Git and GitHub | Branches, Pull Requests, Merging vs Rebasing

In this video, you’ll learn how to collaborate using Git and Github and what the best practices are when working on a team. Luna and Jen go through a full workflow where they show how to make your own branch in Git, switch between branches, make a pull request in Github, merge your branch using git merge or git rebase, and resolve those inevitable merge conflicts. This is an essential workflow for anyone who wants to use Git and Github with a team!

If you’ve never used Git and GitHub, here’s a video on the very basics: https://youtu.be/PhG72KirgLo

Decrypted by Jennifer Lin and Luna Ito-Fisher ✨
Video edited by Jennifer Lin

----
0:00 - Intro
0:40 - Branching in Git/Github
4:56 - Making a pull request on Github
7:16 - Reviewing a pull request
8:30 - Other pull request features
9:24 - Rebasing
11:23 - Merging and resolving merge conflicts
15:00 - End
----

📖 Resources 📖

Resolving merge conflicts in VS Code: https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts
KDiff3: http://kdiff3.sourceforge.net/
Meld: https://meldmerge.org/help/resolving-conflicts.html

Music by Gil Wanders - Dreams - https://thmatc.co/?l=C14A91F4
Music by Chinsaku - Blossom - https://thmatc.co/?l=B4821A8E
Music by Dylan Rockoff - Anymore (NDAF Chill Remix) - https://thmatc.co/?l=321E137B

🌟 Connect with us on social media! 🌟

Instagram: https://www.instagram.com/decryptedbyus/
LinkedIn: https://www.linkedin.com/company/decryptedbyus/
Facebook: https://www.facebook.com/decryptedbyus

👩🏽‍💻 Who are we? 👩🏽‍💻

Decrypted By Us is a learning community by and for students from groups underrepresented in Computer Science. We believe the field of CS should be more inclusive and welcoming of students from diverse academic, cultural, and socioeconomic backgrounds. We do this by creating videos about applied CS topics, that represent and speak to underrepresented CS students to encourage them to pursue their interests and goals.

Email: [email protected]

Тэги:

#git_and_github_tutorial #git_and_github_tutorial_for_beginners #git_branching_and_merging_strategies #git_branch_tutorial #git_branch_and_merge_tutorial #git_branches_explained #git_branching_tutorial_for_beginners #github_for_beginners #github_pull_request_tutorial #github_pull_request_branching_merging_&_team_workflow #github_pull_request_review #git_merge_conflict #git_merge_vs_rebase #git_merge_branch_to_master #git_merge_conflict_tutorial #resolving_merge_conflicts_in_git

Скачать видео