Projects >> jboss-eap-quickstarts >>808d1f8c8526d0f7224937abcda9116d165db829

Chunk
Conflicting content 
      Shell shell = getShell();
      Resource currentDirectory = shell.getCurrentResource();
<<<<<<< HEAD
      assertNotSame(home.getFullyQualifiedName(), currentDirectory.getFullyQualifiedName());
=======
      assertNotSame(home.getAbsolutePath(), currentDirectory.getFullyQualifiedName());
>>>>>>> 069eb71a4e39378ea5d8e5b29ce223f0c3b8f1f5

      shell.execute("cd ~");
Solution content 
      Shell shell = getShell();
      Resource currentDirectory = shell.getCurrentResource();
      assertNotSame(home.getFullyQualifiedName(), currentDirectory.getFullyQualifiedName());

      shell.execute("cd ~");
File
ChangeDirectoryPluginTest.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
      shell.execute("cd ~");

      currentDirectory = shell.getCurrentResource();
<<<<<<< HEAD
      assertEquals(home.getFullyQualifiedName(), currentDirectory.getFullyQualifiedName());
=======
      assertEquals(home.getAbsolutePath(), currentDirectory.getFullyQualifiedName());
>>>>>>> 069eb71a4e39378ea5d8e5b29ce223f0c3b8f1f5
   }

   @Test
Solution content 
      shell.execute("cd ~");

      currentDirectory = shell.getCurrentResource();
      assertEquals(home.getFullyQualifiedName(), currentDirectory.getFullyQualifiedName());
   }

   @Test
File
ChangeDirectoryPluginTest.java
Developer's decision
Version 1
Kind of conflict
Method invocation