Projects >> console >>812cfd9810292f070270b22b5eb5dee3d7e53c29

Chunk
Conflicting content 
        ReificationWidget widget = null;
        if (isValid())
        {
<<<<<<< HEAD:gui/src/main/java/org/jboss/as/console/client/mbui/cui/reification/Reificator.java
            assert !interactionUnit.hasParent() : "Entry point interaction units are not expected to have parents";

            result = startReification(interactionUnit, context);
=======
            widget = startReification(interactionUnit, context);
>>>>>>> 20886e7d54e8d820c92b034782769f7639057eea:gui/src/main/java/org/jboss/as/console/client/mbui/cui/reification/pipeline/BuildUserInterfaceStep.java
        }
        context.set(WIDGET, widget);
        callback.onSuccess(TRUE);
Solution content 
        ReificationWidget widget = null;
        if (isValid())
        {
            assert !interactionUnit.hasParent() : "Entry point interaction units are not expected to have parents";
            widget = startReification(interactionUnit, context);
        }
        context.set(WIDGET, widget);
        callback.onSuccess(TRUE);
File
BuildUserInterfaceStep.java
Developer's decision
Combination
Kind of conflict
Assert statement
Method invocation
Variable
Chunk
Conflicting content 
                        try
                        {
                            context.push();
<<<<<<< HEAD:gui/src/main/java/org/jboss/as/console/client/mbui/cui/reification/Reificator.java
=======
                            context.set("hasParent", true);
>>>>>>> 20886e7d54e8d820c92b034782769f7639057eea:gui/src/main/java/org/jboss/as/console/client/mbui/cui/reification/pipeline/BuildUserInterfaceStep.java
                            ReificationWidget childWidget = startReification(childUnit, context);
                            if (childWidget != null)
                            {
Solution content 
                        try
                        {
                            context.push();
                            ReificationWidget childWidget = startReification(childUnit, context);
                            if (childWidget != null)
                            {
File
BuildUserInterfaceStep.java
Developer's decision
Version 1
Kind of conflict
Method invocation