Projects >> AFS-Dev >>77efbc5f7a47d54265cec06186fb7ffbdf5183e7

Chunk
Conflicting content 
        
        {
            byte[] k1 = { 0 , 2 } ;
<<<<<<< HEAD
            byte[] k2 = { 0 , 3 } ;
=======
            byte[] k2 = { 0 , 4 } ;
>>>>>>> 4f3cda03c34eea8e4bf7e860edfa62f374508145
            byte[] k3 = { 0 , 2 , 4 , 6  } ;
            
            byte[] k4 = { 0 , 2 , 4 , 5 } ;
Solution content 
        
        {
            byte[] k1 = { 0 , 2 } ;
            byte[] k2 = { 0 , 3 } ;

            byte[] k3 = { 0 , 2 , 4 , 6  } ;
            
            byte[] k4 = { 0 , 2 , 4 , 5 } ;
File
MainRadix.java
Developer's decision
Version 1
Kind of conflict
Array initializer
Variable
Chunk
Conflicting content 
            byte[] k4 = { 0 , 2 , 4 , 5 } ;
            byte[] k5 = { 0 , 1 } ; 
            
<<<<<<< HEAD
            byte[] keyStart1 = { 0 , 2 } ;
            byte[] keyStart2 = { 0 , 1 } ;
            byte[] keyStart3 = { 0 , 2 , 4} ;
            byte[] keyStart4 = { 0 , 2 , 4, 6} ;
            byte[] keyFinish = null ;
            RadixTree t = tree(k1,k2,k3) ;
            //t.printLeaves() ;
            t.print() ;

            RadixTree.logging = true ;
            iterator(t, keyStart1, keyFinish) ;
            iterator(t, keyStart2, keyFinish) ;
            iterator(t, keyStart3, keyFinish) ;
            iterator(t, keyStart4, keyFinish) ;
=======
            byte[] keyStart = { 0 ,2 , 4} ;
            byte[] keyFinish = null ;
            RadixTree t = tree(k1,k2,k3) ;

            RadixTree.logging = true ;
            
            Iterator iter = t.iterator(keyStart, keyFinish) ;
            for ( ; iter.hasNext() ; )
                System.out.println(iter.next()) ;
>>>>>>> 4f3cda03c34eea8e4bf7e860edfa62f374508145
            
            //testIter(t, keyStart, keyFinish, k2, k3) ; 
            RadixTree.logging = false ;
Solution content 
            byte[] k4 = { 0 , 2 , 4 , 5 } ;
            byte[] k5 = { 0 , 1 } ; 
            
            byte[] keyStart1 = { 0 , 2 } ;
            byte[] keyStart2 = { 0 , 1 } ;
            byte[] keyStart3 = { 0 , 2 , 4} ;
            byte[] keyStart4 = { 0 , 2 , 4, 6} ;
            byte[] keyFinish = null ;
            RadixTree t = tree(k1,k2,k3) ;
            //t.printLeaves() ;
            t.print() ;

            RadixTree.logging = true ;
            iterator(t, keyStart1, keyFinish) ;
            iterator(t, keyStart2, keyFinish) ;
            iterator(t, keyStart3, keyFinish) ;
            iterator(t, keyStart4, keyFinish) ;
            
            //testIter(t, keyStart, keyFinish, k2, k3) ; 
            RadixTree.logging = false ;
File
MainRadix.java
Developer's decision
Version 1
Kind of conflict
Array initializer
Comment
For statement
Method invocation
Variable