//go back to develop and do a commit
git.checkout().setName(flow.getDevelopBranchName()).call();
File junkFile = new File(git.getRepository().getWorkTree(), "junk.txt");
FileUtils.writeStringToFile(junkFile, "A");
git.add().addFilepattern(junkFile.getName()).call();
git.commit().setMessage("committing junk file").call();
//commit the same file in feature to create a conflict
git.checkout().setName(flow.getFeatureBranchPrefix() + "my-feature").call();
FileUtils.writeStringToFile(junkFile, "B");
git.add().addFilepattern(junkFile.getName()).call();