Interesting. svn should be really stable, so introducing a conflict
should require a monumental amount of effort. Ah, svn. I don't miss you.
Maybe put an "Update from live wiki" process document on the wiki for
future reference? Then you can forget svn completely. Free up the
brain cells.
Ted.
On 4/8/22 11:18 AM, Rosegarden SVN repository wrote:
Update from live wiki. I just bungled an svn command (I can hardly remember how
to use svn!) and introduced a substantial merge conflict from somewhere, but I t
hink I've recovered it - if the wiki turns out to be in a mess, please let me kn
ow!
By cannam on 04/08/2022 15:18
[**View Changes**](https://sourceforge.net/p/rosegarden/code/16122/)
---
Sent from sourceforge.net because you indicated interest in
<https://sourceforge.net/p/rosegarden/code/>
To unsubscribe from further messages, please visit
<https://sourceforge.net/auth/subscriptions/>
_______________________________________________
Rosegarden-devel mailing list
[email protected] - use the link below to unsubscribe
https://lists.sourceforge.net/lists/listinfo/rosegarden-devel
