🥋Creating a combined branch with parents allows you to work on multiple branches simultaneously.
🔀Merge commits are used to combine branches and make them parents of a new revision.
📝You can make changes that depend on code from multiple branches in the combined branch.
📂Moving changes between branches can be done by simply transferring commits or modifying existing commits.
🔄Checking out individual branches allows you to see changes specific to that branch without affecting others.
How can I work on multiple branches at the same time?
—You can create a combined branch that includes multiple branches as parents, allowing you to work on all of them simultaneously.
What is a merge commit?
—A merge commit is used to combine two or more branches and make them parents of a new revision.
Can I make changes that depend on code from multiple branches?
—Yes, by creating a combined branch, you can make changes that depend on code from multiple branches.
How can I move changes between branches?
—You can either transfer entire commits or modify existing commits to move changes between branches.
Can I see changes specific to a single branch without affecting others?
—Yes, by checking out an individual branch, you will be able to see changes specific to that branch without affecting others.
00:01Demonstration of a powerful Jiu-Jitsu workflow with multiple branches.
00:13Creating a combined branch with parents to work on multiple branches simultaneously.
00:31Using merge commits to combine branches and make them parents of a new revision.
00:47Making changes that depend on code from multiple branches in the combined branch.
01:03Moving changes between branches by transferring or modifying commits.
01:20Checking out individual branches to see branch-specific changes without affecting others.
