You are building the latest webapp with the coolest features like login, payments, and dashboard.
You have been working on all of these changes on separate branches and you now want to merge them all into main
.
Merge the feature/login
branch into main
first.
Merge the feature/dashboard
branch into main
next.
Merge the feature/payment
branch into main
last.
The final Git graph (using git log --oneline --graph
) should look like this:
gitGraph
commit
branch feature/login
checkout main
branch feature/dashboard
checkout main
branch feature/payment
checkout feature/login
commit
commit
checkout main
merge feature/login
checkout feature/dashboard
commit
commit
commit
checkout main
merge feature/dashboard
checkout feature/payment
commit
commit
checkout main
merge feature/payment