Re: git issue

[Dave Jones <davej@codemonkey.org.uk>]

On Wed, Jul 01, 2015 at 03:37:48PM +0200, Toralf Förster wrote:
 > got today :
 > 
 > $ cd ~/devel/trinity; git pull                       
 > U       blockdevs.c
 > U       debug.c
 > U       rand/random-pathname.c
 > U       rand/random.c
 > U       shm.c
 > U       tools/analyze-sockets.c
 > U       uid.c
 > 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.
 > 
 > 
 > tfoerste@t44 ~/devel/trinity $ git diff
 > 
 > tfoerste@t44 ~/devel/trinity $ git status
 > On branch master
 > Your branch and 'origin/master' have diverged,
 > and have 3702 and 3711 different commits each, respectively.
 >   (use "git pull" to merge the remote branch into yours)
 > You have unmerged paths.
 >   (fix conflicts and run "git commit")

I wondered if anyone would notice this.
I edited history to fix up two broken commit dates.

Just reclone. Shouldn't happen again.

	Dave