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 WordsIncorporate changes
Task 5: Bottom Section (continued)
On the previous page, we only had a look at the first part of our path on the roadmap to update the Content Container PR.
As a reminder: these are the steps we already took.
But what is the answer to the second question: does a branch depend on the new changes in the content-container branch?
The answer is yes because we created the bottom-section branch from the content-container branch.
This is what our complete path looks like.
The next few steps that we need to take are
- check out the
bottom-sectionbranch - push the branch
- rebase the
bottom-sectionon thecontent-containerbranch
Don't worry if you don't know what rebase means. We'll get into that on the next page.
For now, check out the bottom-section branch and push it (shouldn't have any effect but just to be sure).
Next: Rebase