Skip to content

10-fast-forwarding-with-advance.md

Latest commit

 

History

History
37 lines (23 loc) · 1.22 KB

10-fast-forwarding-with-advance.md

File metadata and controls

37 lines (23 loc) · 1.22 KB

Tutorial - Part 10: Fast-forwarding with advance

Once you've finished work on a child branch and want to merge it into its parent, you might want to do a fast-forward merge to keep the history linear.

The advance command

When you are on a parent branch (e.g., develop), and you want to fast-forward it to its child branch, run:

git machete advance

How it works

  1. Checks whether the current branch has exactly one child branch.
  2. If there are multiple children, prompts you to choose one.
  3. Fast-forwards the current branch to the selected child.
  4. Optionally pushes the parent branch to the remote.
  5. Optionally slides out the child branch from the layout (since its commits are now part of the parent).

Example

Before git machete advance:

Check out develop and run git machete advance and confirm the suggested actions:

After git machete advance:

The call-ws branch is now merged into develop and removed from the machete layout.

< Previous: Automating workflow with traverse | Next: Cleaning up with slide-out >