Set branch 'develop' as default about tutorials.tourguide-app

[dmabtrg]

Also, I think we should rebase develop on top of current master before merging any of the open pull requests.

[dmabtrg]

Following the change from master to develop as default branch, the develop branch was some commits behind master. To fix this before more changes land on the branch, we've just rebased the develop branch on top of master, making the develop branch up to date with the latest changes that were merged to master. This change requires you to update your local copy of the repository and your forks to sincronize the branch. To do this, follow this steps:

• First, make a backup copy of your local repository, just in case something goes horribly wrong. If using linux, this should be enough:

  cp -a my-local-repository my-local-repository-$( date +%Y%m%d )
  

• In case you have a local copy of the main repository:

  git checkout develop
  git pull --rebase
  

• For your local copy of the fork repository:

  • Get the latest changes from the upstream repository:

    git fetch upstream
    

  • If you have local uncommited changes, stash them before rebasing

    git stash
    

  • Rebase the develop branch:

    git rebase upstream/develop develop
    

  • Rebase any branch stemmed from develop

    git rebase develop <branch>
    

  • Push changes to your fork on github

    git push --force origin develop
    git push --force origin <branch>
    

Remember that all development must be done against the develop branch.

[dmabtrg]

Ok, the new default branch is develop and is up to date with master, so this can be closed.