unsolvable conflict when editing front page

[GoogleCodeExporter]

Making tests on gitit I ended in a non modifiable "Front Page"

My aim is to check that it is possible to have contributers to a wiki that are 
not connected to Internet.

To do so, I created a gitit site, then I made a bare git shared directory
Then I made a copy of the gitit site at the second test location.

From then each site does contribute to his copy, then from time to time, I come 
physically with a usb key and merge changes from one to others.

I created conflicts on purpose, then solved them (from command line)

now, git status is up-to date and ok from command line :
/tmp/gitit/test1/wikidata$ git status
# On branch master
nothing to commit (working directory clean)

git push shared
Everything up-to-date

 git pull shared master 
From ../../original
 * branch            master     -> FETCH_HEAD
Already up-to-date.

So everything seem ok
unfortunatly, in my tests I broke the "Front Page"
if you go for editing "Front Page", you cannot save, you get :

The page has been edited since you checked it out. Changes from revision 
3f736c14e1f96fad1b5203a3b5faa8714bd8d8f3 have been merged into your edits 
below. Please resolve conflicts and Save.

But impossible to find why it is so and how to fix it.

Original issue reported on code.google.com by samuel.b...@gmail.com on 9 May 2013 at 4:58

Attachments:

• gitit.tar.gz

[GoogleCodeExporter]

I found that editing the Front Page text with an editor and then commiting from 
command line solved to problem.
The new version is editable.

But still, I think it is a bug.

Original comment by samuel.b...@gmail.com on 11 May 2013 at 9:56

[GoogleCodeExporter]

This is the old bug tracker.  Please use the tracker at
https://github.com/jgm/gitit/issues.
Thanks.

Original comment by fiddloso...@gmail.com on 11 May 2013 at 2:59