On 23/05/2011 13:03, Ulrich Stärk wrote:
What makes you think that it is in conflict? When I go to the CMS site and
click the publish link to
get a diff it doesn't show anything about the guide. Note: it might well be
possible that I messed
up that page but I can't see how I could resolve the i
Just guessing, but iirc the CMS does a checkout for each user so can it be that
just your working
copy is in conflict, i.e. you edited the page while someone else (me?)
committed changes? In that
case you can try to click "Edit this directory" when browsing the Index and see
if the "resolve"
lin
What makes you think that it is in conflict? When I go to the CMS site and
click the publish link to
get a diff it doesn't show anything about the guide. Note: it might well be
possible that I messed
up that page but I can't see how I could resolve the issue since I don't even
see one...
Uli
O
On 28/04/2011 22:46, Ross Gardler wrote:
Whoever last edited the "Guide to being a mentor" on the website has
left it in a state of conflict - can you please resolve this.
These pages are still in conflict, can whoever put it in this state
please fix it, it's hard to use the web based CMS whil
Whoever last edited the "Guide to being a mentor" on the website has
left it in a state of conflict - can you please resolve this.
Ross
