Fairytale: workflow with main, develop and topic branches

[richelbilderbeek]

Depends on:

• [ ] #4

In this repository, there is a file called fairytale.md, which contains a to-be fairytale. There are no requirements on the story of the fairytales :-)

You work in a duo/trio.

First:

• Each member creates a branch with his/her name in lowercase without special characters (e.g. richel for Richèl). Branch off from develop

For at least 2 times:

• update your branch by merging develop to yours (see commands below), fix merge conflicts in any way you like
• on your branch, modify the fairytale it by adding/changing at most one sentence and upload it using the git basic workflow
• merge your branch to develop, fix merge conflicts in any way you like
• let the next member do the same

At end:

• Each member removes his/her branch

Command-line commands

See basic git workflow #4

# Change to your branch
git checkout richel
git pull

# Merge develop to the branch you are on
git merge develop

# Basic git workflow
git add .
git commit -m "Progress #5"
git push

# Change to the develop branch
git checkout develop
git pull

# Merge your branch to develop
git merge richel

[richelbilderbeek]

Not needed with this team :-)