I did my merging already at the 15th of September. Gone have a look at
it as well.
Markus
Am 29.09.2011 01:12, schrieb Christopher Brooks:
I updated trunk and branch 1.2.x to the same head version, version
11029. I then attempted to merge the two to determine where conflicts
may still lie:
cd /opt/matterhorn/matterhorn_trunk
svn merge --dry-run https://opencast.jira.com/svn/MH/branches/1.2.x .
I filed conflicts to several committers as subtickets here:
https://opencast.jira.com/browse/MH-8189
If you can't fix these (for whatever reason), please hive off what you
can and create other tickets for other committers for the ones you
can't. These merge changes are blocking the ability to cut 1.3 cleanly.
Tobias and Markus K, and work on the integration tests/selenium tests
respectively?
Chris
_______________________________________________
Matterhorn mailing list
[email protected]
http://lists.opencastproject.org/mailman/listinfo/matterhorn
To unsubscribe please email
[email protected]
_______________________________________________
