Merge Many Features

Senior

Task

Combine two remote feature branches in the local main, and then publish the result.

Steps

While on main, merge o/side1.
Then merge o/side2.
Push the updated main to origin.

Expected result

main must contain the changes of both branches and end with the final merge commit. The local main, o/main and the remote main must be in sync.

What you will learn

After completing this task you will be able to:

merge remote-tracking branches into the local main branch;
combine several lines of development one after another;
publish an already integrated result.

Goal

local

origin