Projects >> java-sdk >>21af902e2fe7564fe40f040ba8dd8a9b37fc6fa0

Chunk
Conflicting content
			PutExtra extra = new PutExtra();

<<<<<<< HEAD
			PutRet ret = IoApi
					.putFile(uptoken, key, localFile, extra);

			assertTrue(ret.ok());
			assertTrue(expectedHash.equals(ret.getHash()));

=======
			// upload 3 files
			for (int i = 0; i < 3; i++) {
				PutRet ret = IoApi.putFile(uptoken, key + "_" + i, new File(localFile), extra);
				assertTrue(ret.ok());
				assertTrue(expectedHash.equals(ret.getHash()));
			}
			
>>>>>>> d02ded7e3552592905a25809886e1b458c85279e
		}
		// we don't checkout the result of how may items are in the buckets.
		// not very convient, it's better, although.
Solution content
			PutExtra extra = new PutExtra();

			// upload 3 files
			for (int i = 0; i < 3; i++) {
				PutRet ret = IoApi.putFile(uptoken, key + "_" + i,localFile, extra);
				assertTrue(ret.ok());
				assertTrue(expectedHash.equals(ret.getHash()));
			}
			
		}
		// we don't checkout the result of how may items are in the buckets.
		// not very convient, it's better, although.
File
RSFTest.java
Developer's decision
Manual
Kind of conflict
Comment
For statement
Method invocation
Variable