Rebase

[Code-Over-Time]

Category: General Development

Level: Principle

Description

The main branch of Varcade Games has moved on significantly from the branch you have been working on. Most of the changes are in the Varcade Games UI.

It is time to pull all of those changes into our development branch. To do that we need to use a feature of Git called 'Rebase'.

Basically you will be pulling all of the commits from the latest Varcade Games branch and applying all of your work on top of them.

Rebasing is a process of selecting commits to apply and dealing with conflicts. You will likely find most conflicts in the Varcade Games client code, as most of the changes have been there.

This process can be messy and tedious, but it is worth getting some experience doing it as you will almost certainly face this out in the real world.

You should use this command to kick the process off:

git rebase --onto v1.0.0 development

Once you complete this process you will need to test that the site still works. This will also involve running Django migration for the game portal.

Deliverable

• Development branch is rebased off Git

Acceptance Criteria

• Development branch is functional with latest Varcade Games UI (as seen on the dev server)
• All new features added to development branch before rebasing are still functional

---

Task Tips!

• It's worth doing a bit of research around rebasing and its benefits