cannot sync - pulling is not possible because you have unmerged files

[db]

On 10 Oct 2017, at 15:08, Chris Jones <jonesc at hep.phy.cam.ac.uk> wrote:
> > git status

$ git status
On branch master
Your branch is up-to-date with 'origin/master'.

Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

	modified:   _resources/port1.0/fetch/mirror_sites.tcl
	modified:   _resources/port1.0/group/cmake-1.0.tcl
	modified:   _resources/port1.0/group/perl5-1.0.tcl
	modified:   _resources/port1.0/group/ruby-1.0.tcl
	modified:   cad/gaw/Portfile
	modified:   comms/hidapi-devel/Portfile
	modified:   comms/telepathy-qt/Portfile
	modified:   finance/cpuminer/Portfile

[…snip…]

Unmerged paths:
  (use "git reset HEAD <file>..." to unstage)
  (use "git add <file>..." to mark resolution)

	both modified:   _resources/port1.0/group/cxx11-1.1.tcl
	both modified:   _resources/port1.0/group/qt5-1.0.tcl
	both modified:   comms/c3270/Portfile
	both modified:   erlang/rebar3/Portfile
	both modified:   fuse/osxfuse/Portfile
	both modified:   fuse/sshfs/Portfile

[…snip…]