Git repository move
We have moved from github.com to gitlab.com. See the announcenment for reasoning.
Please configure your git repositories to point to the new location by editing .git/config
in your pmbootstrap
(or other postmarketOS git repository) folder.
Simply replace github.com
with gitlab.com
, then run:
$ git checkout master
Already on 'master'
Your branch is up to date with 'origin/master'.
$ git pull
...
Removing .travis.yml
Automatic merge failed; fix conflicts and then commit the result.
$ git merge --abort
$ git reset --hard origin/master
If that does not work for whatever reason, you can also delete your pmbootstrap
folder and do a fresh clone:
$ git clone https://gitlab.postmarketos.org/postmarketOS/pmbootstrap.git