I made no local changes; and get the following message: git reset --hard origin/firedrake HEAD is now at 511e85b runhtml.py: fix bug with searching for warnings ________________________________ From: firedrake-bounces@imperial.ac.uk <firedrake-bounces@imperial.ac.uk> on behalf of Miklós Homolya <m.homolya14@imperial.ac.uk> Sent: Monday, May 9, 2016 8:31 AM To: firedrake@imperial.ac.uk Subject: Re: [firedrake] broken install Dear Onno, It seems that you have made local changes to some of the firedrake components. Or maybe it is PETSc, and you haven't updated since 11 January? If the former, and you still need those changes, then you have to go through the git merge. If you don't need those changes, you can use: git reset --hard origin/master # origin/firedrake for PETSc and petsc4py If the latter, follow the instructions below: 1. Change to the petsc src directory of your firedrake installation: cd path/to/firedrake/src/petsc 2. Update the PETSc source tree. git fetch origin # Only do this next step if you have NO CHANGES TO PETSc # that you want to keep. If you do have local changes, # please email and we can fix up the instructions. git reset --hard origin/firedrake 3. cd to the top directory of the firedrake virtualenv . ./bin/activate cd src/firedrake/ git pull ./scripts/firedrake-install --rebuild-script --your-install-options Replace --your-install-options with the options you used to install Firedrake. Then run: 4. firedrake-update --clean --rebuild If the update script asks you to run it again, then please do so. When the update finished, do not forget to clean your cache: firedrake-clean On 9 May 2016, at 08:07, Onno Bokhove <O.Bokhove@leeds.ac.uk<mailto:O.Bokhove@leeds.ac.uk>> wrote: Dear, How to I "fix them up in the work tree", etc? I try to update firedrake because a couple of update from Will and Fruderyk don't work on my laptop. I used the: cd src/firedrake git pull ./scripts/firedrake-install --rebuild-script in the virtualenv Pull is not possible because you have unmerged files. Please, fix them up in the work tree, and then use 'git add/rm <file>' as appropriate to mark resolution and make a commit. Traceback (most recent call last): File "../bin/firedrake-update", line 905, in <module> petsc_changed = git_update("petsc", deps["petsc"]) File "../bin/firedrake-update", line 336, in git_update check_call(["git", "pull"]) File "../bin/firedrake-update", line 205, in check_call subprocess.check_call(arguments, env=env) File "/usr/local/Cellar/python/2.7.10_2/Frameworks/Python.framework/Versions/2.7/lib/python2.7/subprocess.py", line 540, in check_call raise CalledProcessError(retcode, cmd) subprocess.CalledProcessError: Command '['git', 'pull']' returned non-zero exit status 1 _______________________________________________ firedrake mailing list firedrake@imperial.ac.uk<mailto:firedrake@imperial.ac.uk> https://mailman.ic.ac.uk/mailman/listinfo/firedrake