[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Sc-devel] MachineListening commits



2007/11/20, nescivi <nescivi@xxxxxxxxx>:
> On Tuesday 20 November 2007 00:18:20 Click Nilson wrote:
> > oops, yes, I accidentally checked in the Synth project which is the
> > same as the one in there already... I hope. Actually, I may have
> > modified this; can someone tell me how to revert a specific file:
> > Synth.xcodeproj/project.pbxproj
> > Or just revert it yourself...
>
> svn revert <filename>

No, actually it says in the SVN book this is the wrong thing to do,
because you can't commit that since it's out of date. The right thing
is to merge:

http://svnbook.red-bean.com/en/1.4/svn.branchmerge.commonuses.html#svn.branchmerge.commonuses.undo

Dan