Task 1: Header
PlanningImplementationOpen a Pull RequestRequest a reviewPR is approvedMerging the PRUpdate the local repositoryGit theory
Merge vs. Squash MergeTask 2: Footer
PlanningImplementationThe FixContinue with footerChange RequestsUpdate the local repositoryTask 5: Bottom Section (continued)
Incorporate changesRebaseDouble-checkForce PushInteractive RebaseAnother PRMerge ConflictsFinal RebaseResolving the ConflictsUncovering a ProblemRecap
Final WordsGit workflows
Intro
In this course, you will learn and use the GitHub flow. You might be asking: Why this workflow and not another one?
Good question.
Two very popular Git workflows out there are:
I won't go into the details of Git flow. The quick answer why we don't use it here is
- it's quite complicated with a lot of branching conventions
- it's most useful for versioned software like desktop applications.
Since a lot of the software that's written today doesn't require strict versioning (e.g. web applications) Git flow is often overkill. Even the original author discourages developers to use it in most situations.
GitHub flow on the other hand is much more lightweight. Thus it's a great starting point to get into using Git in a team environment.
Next: The Flow