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