Learning GitHub Part 4
Download as PPTX, PDF2 likes7,700 views
This document discusses different aspects of using GitHub including branching, merging, pull requests, forking and resolving conflicts. It explains that branching allows creating different versions of code that can be merged together later. Merge conflicts occur when GitHub cannot determine how to integrate changes and must be resolved manually. Forking makes a copy of a repository that is owned by the user and used differently than branching. Pull requests allow requesting that a contributor integrate updates to their repository, often used with forking.
Learning GitHub Part 4
- 1. Commit Yourself Learning GitHub - Part 4
- 2. Commit Yourself Learning GitHub - Part 4 What you have learned: Part 1 - WHAT -What is Github? -Who uses Github? -Why should you use Github? -When to use Github? Part 2 - HOW -How to create an account -How to create a repository -How to select and set up a Github client -How to work with repositories What you will learn: Part 3 - WHEN -When to clone? -When to add? -When to commit? -When to check status? -When to push? -When to pull? Part 4 - CONFLICT -What is branch? -What is a pull request? -What is a merging? -What is a fork? -What else?
- 3. Simplest Conflict Resolution No Branching ● Small team or just you ● Push/Pull Manually o Verify o Resolve
- 4. Branching
- 5. What is a GitHub Branch? Branching ● Verify Permissions ● Plan the work ● Create the branch ● Add code to the branch ● Merge branches ● Resolve conflicts
- 6. About Merge Conflicts ● Occur when GitHub cannot determine how to resolve ● You resolve via the Git tools (command line)
- 7. Forking
- 8. What is a GitHub Fork? Forking ● Creates your copy ● You own it ● Resolved differently than branching...
- 9. Branch or Fork or Both?
- 10. What is a Pull Request? Request to contributor to accept updates to their repository Often used with Forking
- 11. git advanced commands git branch -> work with branches git checkout -> checkout a branch git diff -> show differences git init -> create empty repo git log -> show commit logs git merge -> join two histories
Editor's Notes
- #10: drawing credit - http://www.inkandpen.co.uk/two_trees.html