On Fri, Sep 4, 2009 at 5:32 PM, Julie S<[email protected]> wrote:
> 1. How do you "resolve" conflicts? Probably a big question.
>
> 2. with the different parts of foo.c what is r715, and r8119 telling me? My
> guess would be that it means the revision number that there is a conflict.
>
> ...
>
> I'm happy to use Kompare or another tool to revert changes in the branch, if
> that is what they mean by resolving conflict.
Hi Julie --
What is happening is that you are trying to merge changes into a file
that someone else had also modified, and there is a certain line or
lines that the svn merge can't figure out which is the correct one.
Basically what you have to do is use a 2 or 3-way comparison using a
tool like meld (available in most Linux distros) to resolve the
conflict. You will compare the foo.8115, foo.working and foo.8119
versions of the file so you can see what line(s) are conflicting, save
the changes to foo.working (it will be easy to merge in the changes
manually, once you see the visual compare) and then copy foo.working
back to the original name and then do
svn resolve foo.c
Then you compile, test, etc before commiting.
-- Brett
------------------------------------------------------------
"In the rhythm of music a secret is hidden;
If I were to divulge it, it would overturn the world."
-- Jelaleddin Rumi
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Rosegarden-devel mailing list
[email protected] - use the link below to unsubscribe
https://lists.sourceforge.net/lists/listinfo/rosegarden-devel
