3 # This essentially could be solved by:
4 # git config pull.rebase true
5 # git config rebase.autoStash true
6 # but chances are that this is easy to
8 # so execute this file on the server
9 # instead of setting a git config.
11 echo "Running git pull with autoStash and rebase"
12 echo "If anything breaks in the future, delete"
13 echo "and repeat - it was once considered to"
14 echo "be responsible for non-trivial conflicts!"
15 echo "We apply this because we need to build the"
16 echo "handbook and tutorial without manual interventions."
18 git pull --rebase --autostash