stuartbright / exemplar-php-rebasing

Rebase 101

There are two rebasing exercises to complete.

Useful Reading

Explanation and overview of rebasing

https://www.benmarshall.me/git-rebase/

Comparison of rebasing and merging

https://slides.com/paul_melero/git-rebase#/21/0/0

Now complete the exercises below

Dont be afraid to ask your line manager or a colleague for help completing this exercises

EXERCISE 1

Goals

You should end up with a single consolidated readme file - this will generate conflicts that need will resolving!

In each of the branches you will find an edited readme with instructions for the rebase task, complete each task using rebase then merge these updated changes back to the trunk. Once complete submit a pull request to this repository and assign to your line manager for review!

Instructions

Fork this repository to your personal GitHub account, this will copy all branchs for you to work on locally, then complete the two tasks using the rebase command (see readme on each branch for details). When complete you should merge the TASK-X branches to the trunk branch.

At the outset the branch tree looks like this:

Once complete the tree should be a single linear commit history resembling that below

The commit history should resemble the following

Add branch readme instruction segments (from merge conflicts) here:

REMOVE_THIS_PLACEHOLDER

EXERCISE 2

Fork the repository below and follow the instructions. This time, once complete, share the forked repository with your line manager for review!

https://github.com/lineten/exemplar-workshop-git-rebase