Learn Git in a Day

Bring Your Work Back Together

Once you're happy with the work on a branch, you'll want to bring those changes into main. This is called merging.

The process is: switch to the branch you want to merge into, then run git merge with the name of the branch you want to merge from:

git switch main
git merge feature/power

Updating f973006..9d67de5
Fast-forward
 calculator.py | 6 ++++++
 1 file changed, 6 insertions(+)

Git says "Fast-forward" - this means main simply moved its pointer forward to the same commit as feature/power, because there were no conflicting changes on main in the meantime. This is the simplest type of merge.

Before merge:

A───B───C───D
            ^  \
            │   E
           main ^
                │
          feature/power


After fast-forward merge:

A───B───C───D───E
                ^
                │
          main, feature/power