Pascal Hibon wrote: > It appears I don't have a soa-update file. I guess this is due to the > git pull failure: > > > Code: -------------------- > > > # git pull > > remote: Counting objects: 10, done. > remote: Compressing objects: 100% (4/4), done. > remote: Total 7 (delta 4), reused 6 (delta 3) > Unpacking objects: 100% (7/7), done. > From https://github.com/SqueezeOnArch/soa-aur > 4afbccb..c7c44c6 master -> origin/master > Updating 4afbccb..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 > -------------------- > >
Yes - you have edited that file. You need to check it out again or commit it. ------------------------------------------------------------------------ Triode's Profile: http://forums.slimdevices.com/member.php?userid=17 View this thread: http://forums.slimdevices.com/showthread.php?t=101624 _______________________________________________ unix mailing list [email protected] http://lists.slimdevices.com/mailman/listinfo/unix
