[Fiware-developer-experience] Rebase of the develop branch

[David Muriel]

Hi,

Since some of the latest merged changes were merged on master, we need
to bring those changes to the develop branch, as that is now the
default branch.  To do this, the easiest approach is to rebase the
develop branch on top of the master branch before any more changes
land on develop.  I was going to do this and then send instructions on
how to update your repositories to use the rebased branch, but the
develop branch in the github repository is marked as protected and we
don't have permission to temporarily disable this and push the rebase
to github.

José Manuel, could you temporarily disable this protection just so we
can push the rebased branch and then enable it again?  Another option
is for you to make this change following this steps:

  git clone https://github.com/Fiware/tutorials.TourGuide-App.git
tourguide-rebase-develop-branch
  cd tourguide-rebase-develop-branch
  git checkout -b master origin/master
  git rebase master develop
  git push --force origin develop

After this change is pushed to the github repository, we all need to
update our local copy of the repository and our 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
using 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.


Regards,

-- 
David Muriel.