In this episode, you and I will walk through the update workflow using the merge strategy. In order to do this, we’ll have to get creative in order to create a situation where the branch you are working on does not have the most recent updates that are in your
The workflow is:
- Checkout your develop branch.
- Pull the latest changes to update that branch.
- Checkout the change you are working on.
- Then do a
git merge developto update your branch.
When this happens, git will create a “merge commit.” Here, let’s do it together.
Break. Go rest your noodle for a couple of minutes.
Total Lab Runtime: 02:46:31
- 1 Contributor's Workflow Big Picturefree 10:49
- 2 The Wiring - Fork. Clone. Upstream.free 08:51
- 3 Fork a Remote Copypro 02:13
- 4 Clone It to Your Local Machinepro 05:02
- 5 Add Upstream Remotepro 04:34
- 6 Branch Workflowfree 10:30
- 7 Naming Branchespro 05:38
- 8 Create a New Branchpro 03:56
- 9 Switch to a Different Branch (Checkout)pro 05:34
- 10 Do Our Workpro 04:40
- 11 Explore How Work is Isolated in Branchpro 03:19
- 12 Pull Request Workflowfree 06:00
- 13 Push Your Contribution to GitHubpro 04:01
- 14 Open a Pull Requestpro 09:36
- 15 Code Review & Change Requestspro 07:28
- 16 Your Contribution is Approved & Mergedpro 05:19
- 17 Clean up & Pull Down Updatespro 16:08
- 18 Keep Your Branch Up-to-Datepro 06:49
- 19 Update Branch with Mergepro 13:30
- 20 Update Branch with Rebasepro 11:38
- 21 Dealing with Merge Conflictspro 12:23
- 22 Wrap it Upfree 08:33