Hello All,
I've been reading up on how to merge notation_toolbar_2 branch, but have a
question about resolving conflicts (I haven't actually tried the merge yet, so
this may not even apply)
>From RG's dev:branching wiki page:
*** BEGIN ***
Resolving conflicts
In the case of a conflict, there will be 'C' in the place of the file which
contained conflicts.
C foo.c
Such a file will be split into several parts.
foo.c
foo.c.r8115
foo.c.r8119
foo.c.working
After you have resolved conflicts, remove the extra files and commit the
changes.
rm foo.c.*
svn commit -m "merge from trunk"
*** END ***
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.
Some help about all of this would be very helpful. I'd really like to do the
merge instead of having another step up. But a pointer or two in these areas
will go a long way to helping.
Sincerely,
Julie S.
------------------------------------------------------------------------------
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
