Should now pull if it fails rebase. This is to pull with local changes.
Should now pull if it fails rebase. This is to pull with local changes.

artefactual/archivematica,sevein/archivematica,michal-ruzicka/archivematica,sevein/archivematica,eckardm/archivematica,sevein/archivematica,eckardm/archivematica,eckardm/archivematica,michal-ruzicka/archivematica,artefactual/archivematica,michal-ruzicka/archivematica,eckardm/archivematica,sevein/archivematica,artefactual/archivematica,artefactual/archivematica,michal-ruzicka/archivematica