diff --git a/.codenvy/project.json b/.codenvy/project.json new file mode 100644 index 00000000..bff26cc9 --- /dev/null +++ b/.codenvy/project.json @@ -0,0 +1 @@ +{"mixinTypes":["contribution"],"builders":{"configs":{}},"runners":{"configs":{}},"type":"blank","attributes":{}} \ No newline at end of file diff --git a/FetchUpdatesAndMergeRemoteBranchIntoLocalTest.txt b/FetchUpdatesAndMergeRemoteBranchIntoLocalTest.txt index 19884f3c..ec4b7fae 100644 --- a/FetchUpdatesAndMergeRemoteBranchIntoLocalTest.txt +++ b/FetchUpdatesAndMergeRemoteBranchIntoLocalTest.txt @@ -1 +1 @@ -1409909050605_ +1431687609620_change_content diff --git a/GitPullTest.txt b/GitPullTest.txt new file mode 100644 index 00000000..bc54b812 --- /dev/null +++ b/GitPullTest.txt @@ -0,0 +1 @@ +FOR QA diff --git a/GitpullTest.txt b/GitpullTest.txt new file mode 100644 index 00000000..5fe3d6dd --- /dev/null +++ b/GitpullTest.txt @@ -0,0 +1 @@ +//first_change1477990357658 diff --git a/GitpullTets.txt b/GitpullTets.txt deleted file mode 100644 index d742f72c..00000000 --- a/GitpullTets.txt +++ /dev/null @@ -1 +0,0 @@ -//first change1409775636936 diff --git a/PushChangeNonUpdatedRepoTest.txt b/PushChangeNonUpdatedRepoTest.txt index 61e26379..edc1e146 100644 --- a/PushChangeNonUpdatedRepoTest.txt +++ b/PushChangeNonUpdatedRepoTest.txt @@ -1 +1 @@ -//some change_1412177997997 \ No newline at end of file +//some change_1413363451617 \ No newline at end of file diff --git a/README.md b/README.md index 61e26379..9c27835e 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -//some change_1412177997997 \ No newline at end of file +//some change_1413363451617 diff --git a/README2.md b/README2.md new file mode 100644 index 00000000..edc1e146 --- /dev/null +++ b/README2.md @@ -0,0 +1 @@ +//some change_1413363451617 \ No newline at end of file diff --git a/newFile.css b/newFile.css index e69de29b..8b137891 100644 --- a/newFile.css +++ b/newFile.css @@ -0,0 +1 @@ + diff --git a/src/main/java/commenttest/FetchUpdatesAndMergeRemoteBranchIntoLocalTest.java b/src/main/java/commenttest/FetchUpdatesAndMergeRemoteBranchIntoLocalTest.java index 10cc784b..3f86ef96 100644 --- a/src/main/java/commenttest/FetchUpdatesAndMergeRemoteBranchIntoLocalTest.java +++ b/src/main/java/commenttest/FetchUpdatesAndMergeRemoteBranchIntoLocalTest.java @@ -1,4 +1,5 @@ -//1409909050605_ +//1431687609620_change_content +/* * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ @@ -11,7 +12,7 @@ final class FetchUpdatesAndMergeRemoteBranchIntoLocalTest { private ArrayList numbers = new ArrayList(); - public JavaCommentsTest() + public void JavaCommentsTest() { numbers.add(1); numbers.add(2); diff --git a/src/main/java/commenttest/JavaCommentsTest.java b/src/main/java/commenttest/JavaCommentsTest.java index d795e72e..455a2602 100644 --- a/src/main/java/commenttest/JavaCommentsTest.java +++ b/src/main/java/commenttest/JavaCommentsTest.java @@ -1,5 +1,5 @@ -//first change1409775636936 - * +//first_change1477990357657 +/* * This software is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU