[
http://opencast.jira.com/browse/MH-8190?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=28179#comment-28179
]
Rubén Pérez Vázquez commented on MH-8190:
-----------------------------------------
I don't know what I'm doing wrong. I see:
2 (text) conflicts and
5 (tree) conflicts
When I run svn merge in the commandline, I only get prompted for the property
svn:ignore. Nothing else arises.
Eclipse does the same thing: I merge both versions and it says "No conflicts
found".
The other day I could see some differences in certain files (mainly comments
and changes in the import order), but now it just keeps saying both versions
have the same content...
> Outstanding merges for Rubencino
> --------------------------------
>
> Key: MH-8190
> URL: http://opencast.jira.com/browse/MH-8190
> Project: Matterhorn Project
> Issue Type: Sub-Task
> Components: Engage Tools
> Affects Versions: 1.3
> Reporter: Christopher Brooks
> Assignee: Rubén Pérez Vázquez
> Fix For: 1.3
>
>
> 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 .
> Here are the conflicting files I saw that were related to your work (lots of
> updated files, I am presuming these are as expected. They may not be, ymmv).
> C
> modules/matterhorn-search-service-impl/src/main/java/org/opencastproject/search/impl/solr/SolrRequester.java
> C
> modules/matterhorn-search-service-impl/src/main/java/org/opencastproject/search/impl/solr/Schema.java
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators:
http://opencast.jira.com/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira
_______________________________________________
Matterhorn mailing list
[email protected]
http://lists.opencastproject.org/mailman/listinfo/matterhorn
To unsubscribe please email
[email protected]
_______________________________________________
