Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a lesson on branches #5

Open
mistrm82 opened this issue Aug 1, 2024 · 2 comments
Open

Add a lesson on branches #5

mistrm82 opened this issue Aug 1, 2024 · 2 comments
Assignees
Labels
bug Something isn't working

Comments

@mistrm82
Copy link
Contributor

mistrm82 commented Aug 1, 2024

No description provided.

@mistrm82 mistrm82 added the bug Something isn't working label Aug 1, 2024
@mistrm82
Copy link
Contributor Author

mistrm82 commented Aug 1, 2024

For the next iteration of the workshop

@hwick
Copy link
Contributor

hwick commented Aug 2, 2024

Here is a potential outline for branching lesson:

LO:
Learn what a branch is and what they are useful for
Learn how to create a branch and switch between branches in GitHub Desktop
Learn how to make changes to branches in GitHub Desktop
Learn how to merge branches in GitHub Desktop
Explore branch management on GitHub.com

What is a branch?

very basic info on utility of branches: https://docs.github.com/en/desktop/overview/getting-started-with-github-desktop#making-changes-in-a-branch

more detailed info on branches: https://git-scm.com/book/en/v2/Git-Branching-Branches-in-a-Nutshell

How to create a branch in GitHub Desktop, switching between branches, and making changes

creating a branch: https://docs.github.com/en/desktop/making-changes-in-a-branch/managing-branches-in-github-desktop

choosing a branch and creating changes: https://docs.github.com/en/desktop/making-changes-in-a-branch/committing-and-reviewing-changes-to-your-project-in-github-desktop

Cherry picking commits to a branch/creating branch from a commit? (mentioned at the very end of the previous lesson)

NOTE: creating changes section has useful info on discarding or choosing specific bits of changes within a commit which might be useful to add to the original lesson material on commits eventually (can also just be mentioned by teacher during class)

How to merge branches:

https://docs.github.com/en/desktop/making-changes-in-a-branch/managing-branches-in-github-desktop#about-managing-branches

How to create and merge branches on GitHub.com

Summarize above but on GitHub.com

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

No branches or pull requests

3 participants