Page "BloodhoundVendorBranchUpgrade" was changed by gjm Diff URL: <https://issues.apache.org/bloodhound/wiki/BloodhoundVendorBranchUpgrade?action=diff&version=2> Revision 2 Changes: -------8<------8<------8<------8<------8<------8<------8<------8<-------- Index: BloodhoundVendorBranchUpgrade ========================================================================= --- BloodhoundVendorBranchUpgrade (version: 1) +++ BloodhoundVendorBranchUpgrade (version: 2) @@ -38,7 +38,7 @@ # second merge argument is the remote repo path to the newly updated current branch svn merge ^/incubator/bloodhound/vendor/trac/1.0 ^/incubator/bloodhound/vendor/trac/current trac }}} -the above may throw up conflicts due to changes that we have made in bloodhound trunk. + the above may throw up conflicts due to changes that we have made in bloodhound trunk. 1. test test test - note that even when there are no merge conflicts, there may still be errors introduced. 1. commit {{{ -------8<------8<------8<------8<------8<------8<------8<------8<--------
-- Page URL: <https://issues.apache.org/bloodhound/wiki/BloodhoundVendorBranchUpgrade> Apache Bloodhound <https://issues.apache.org/bloodhound/> The Apache Bloodhound (incubating) issue tracker This is an automated message. Someone added your email address to be notified of changes on 'BloodhoundVendorBranchUpgrade' page. If it was not you, please report to .
