Skip to content

Latest commit

 

History

History
32 lines (26 loc) · 2.05 KB

README.md

File metadata and controls

32 lines (26 loc) · 2.05 KB
Raw

🎓 Training on Advanced Git

@robotology-bot and @vvv-school-bot left the company and you have been just hired to take them over 😆

The "bots" were developing a new feature to enable navigation control, each bot on his own branch. The feature is deemed complete but still needs to be integrated in master.

The repository maintainer @pattacini requires you to demonstrate your skills with Git by merging the new feature into master. In particular, you ought to:

  • work in a dedicated sandbox environment.
  • make sure that the resulting master will have the most linear history possible (see below).

To complete the assignment do:

  1. Fork this repository to your own account, which will act as the sandbox. Remember to untick the option 🔲 "Copy the master branch only".
  2. Merge the two concurrent lines of development carried out in the two branches robotology-bot/nav-control and vvv-school-bot/nav-control into a unique branch called feat/nav-control. The branch feat/nav-control is required to have a linear history.
  3. Rebase feat/nav-control on master.
  4. Create a pull request (PR) with the branch master (⚠️ in your fork) as the base branch and feat/nav-control as the compare branch.
  5. Request to review your PR 👋 to turn in the assignment.

Resulting linear histories of master branch

merge of feat/nav-control w/ option --no-ff merge of feat/nav-control