lucene-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Koji Sekiguchi <>
Subject Conflict discovered in 'whoweare.html'
Date Thu, 24 Sep 2009 18:03:18 GMT
I'm trying to add mysel to whoweare.html. I've read:

Unversioned site:

And I done it. Then I noticed this:

So I ssh to and
cd /www/ Then did svn up, I got:

Conflict discovered in 'whoweare.html'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options:

Then I hit Ctrl+C to cancel. I can see the modified files:

$ pwd
$ svn status
! .
? api
? nightly
M whoweare.html
M whoweare.pdf
M developer-resources.html
M developer-resources.pdf

How can I solve the conflict?



To unsubscribe, e-mail:
For additional commands, e-mail:

View raw message