Projects >> cucumber-jvm >>f0e26daf8c26ecb4ef6596b3d50d8cb0efcdb682

Chunk
Conflicting content 
        // Create a step with replaced tokens
        String name = replaceTokens(matchedColumns, headerCells, exampleCells, step.getName());
        if (name.isEmpty()) {
<<<<<<< HEAD
            throw new CucumberException("Step generated from scenario outline '" + step.getName() + "' is empty");
=======
            throw new CucumberException("Step generated from scenario outline is empty: " + step.getName());
>>>>>>> d90c7af9767e392d62a705e40bb029d62b795c27
        }

        return new ExampleStep(
Solution content 
        // Create a step with replaced tokens
        String name = replaceTokens(matchedColumns, headerCells, exampleCells, step.getName());
        if (name.isEmpty()) {
            throw new CucumberException("Step generated from scenario outline '" + step.getName() + "' is empty");
        }

        return new ExampleStep(
File
CucumberScenarioOutline.java
Developer's decision
Version 1
Kind of conflict
Throw statement