[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [Subclipse-users] revert(conflict will be resolved)----make conflict resolved----difference??

From: Mark Phippard <markphip_at_gmail.com>
Date: Fri, 13 Sep 2013 09:48:16 -0400

On Thu, Sep 12, 2013 at 11:26 PM, gaohongyan <ghyghost_at_sohu.com> wrote:

> revert(conflict will be resolved)
> make conflict resolved
>
> ----difference??
>

svn revert will revert a file or folder to the BASE state. So if the file
is conflicted, that means it will undo any local modifications (and
conflicts) and just restore the file to the same state of the file in the
repository.

Marking a conflict resolved, is what you do when you have modifications to
preserve. After you resolve the conflicts in the file you can take the
option to tell SVN that you have resolved the conflicts. After you run
this command, the state of the file would usually be "Modified" which means
it is ready to commit modifications to the repository again. Basically the
same state it would be if you started with a clean file and applied the
changes to it with an editor.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=3064531
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2013-09-13 15:48:23 CEST

This is an archived mail posted to the Subclipse Users mailing list.