Triode wrote:
> I hope this is now fixed.
>
> Some instructions for updating after ssh to root@<address of device>
>
> >
Code:
--------------------
> >
> cd soa-aur
> git pull
> ./soa-update soa-web
>
--------------------
> >
>
> in future you should be able to do just this:
> >
Code:
--------------------
> >
> cd soa-aur
> ./soa-update soa-web
>
--------------------
> >
Triode,
I'm getting an error when attempting a git pull:
Code:
--------------------
[root@soa-vm ~]# cd soa-aur
[root@soa-vm soa-aur]# git pull
remote: Counting objects: 19, done.
remote: Compressing objects: 100% (9/9), done.
remote: Total 14 (delta 9), reused 10 (delta 5)
Unpacking objects: 100% (14/14), done.
From https://github.com/SqueezeOnArch/soa-aur
2ed3af4..c7c44c6 master -> origin/master
Updating 2ed3af4..c7c44c6
error: Your local changes to the following files would be overwritten by
merge:
soa-web/PKGBUILD
Please, commit your changes or stash them before you can merge.
Aborting
[root@soa-vm soa-aur]# ./soa-update soa-web
-bash: ./soa-update: No such file or directory
--------------------
------------------------------------------------------------------------
Krisbee's Profile: http://forums.slimdevices.com/member.php?userid=59080
View this thread: http://forums.slimdevices.com/showthread.php?t=101624
_______________________________________________
unix mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/unix
