Below is the console log of Git training.
Administrator@Admin MINGW64 /e/Training/FirstRepo
$ git init
Initialized empty Git repository in E:/Training/FirstRepo/.git/
Administrator@Admin MINGW64 /e/Training/FirstRepo (master)
Administrator@Admin MINGW64 /e/Training
$ git clone https://github.com/hoangthach252/AutoCucumberFramework.git
Cloning into 'AutoCucumberFramework'...
Username for 'https://github.com': hoangthach252
remote: Enumerating objects: 238, done.
remote: Counting objects: 100% (238/238), done.
remote: Compressing objects: 100% (117/117), done.
remote: Total 1061 (delta 104), reused 176 (delta 72), pack-reused 823
Receiving objects: 100% (1061/1061), 250.14 KiB | 370.00 KiB/s, done.
Resolving deltas: 100% (513/513), done.
Administrator@Admin MINGW64 /e/Training
$ dir
AutoCucumberFramework FirstRepo
Administrator@Admin MINGW64 /e/Training
$ cd AutoCucumberFramework/
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (master)
$ ll
total 0
drwxr-xr-x 1 Administrator 197121 0 Jun 23 18:33 BDD-Java-Framework/
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (master)
$ git status
On branch master
Your branch is up to date with 'origin/master'.
nothing to commit, working tree clean
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (master)
$ git branch MyBranch
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (master)
$ git checkout MyBranch
Switched to branch 'MyBranch'
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (MyBranch)
$ git status
On branch MyBranch
nothing to commit, working tree clean
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (MyBranch)
$ git status
On branch MyBranch
Untracked files:
(use "git add <file>..." to include in what will be committed)
readme.txt
nothing added to commit but untracked files present (use "git add" to track)
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (MyBranch)
$ git add readme.txt
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (MyBranch)
$ git status
On branch MyBranch
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
new file: readme.txt
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (MyBranch)
$ git diff master
diff --git a/readme.txt b/readme.txt
new file mode 100644
index 0000000..5be4a41
--- /dev/null
+++ b/readme.txt
@@ -0,0 +1 @@
+change1
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (MyBranch)
$ git status
On branch MyBranch
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
new file: readme.txt
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: readme.txt
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (MyBranch)
$ git add readme.txt
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (MyBranch)
$ git status
On branch MyBranch
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
new file: readme.txt
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (MyBranch)
$ git commit -m "update2"
[MyBranch b033a8b] update2
1 file changed, 2 insertions(+)
create mode 100644 readme.txt
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (MyBranch)
$
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (MyBranch)
$ git log
commit b033a8be2e2d80990a1250aeffd4e4eb79ea3266 (HEAD -> MyBranch)
Author: Thach Hoang <hoangthach2502@gmail.com>
Date: Sun Jun 23 19:21:50 2019 +0700
update2
commit 260d9c7f281f643992790187138880ef7d9e2ed0 (origin/master, origin/HEAD, master)
Merge: e37ef5f 0414088
Author: hoangthach252 <hoangthach2502@gmail.com>
Date: Thu Jun 20 18:12:26 2019 +0700
Merge pull request #21 from hoangthach252/zenauto-patch-1
Create Pull Request Template
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (MyBranch)
$
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (MyBranch)
$ git checkout master
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (master)
$ git status
On branch master
Your branch is up to date with 'origin/master'.
nothing to commit, working tree clean
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (master)
$ git merge MyBranch
Updating 260d9c7..b033a8b
Fast-forward
readme.txt | 2 ++
1 file changed, 2 insertions(+)
create mode 100644 readme.txt
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (master)
$ git log
commit b033a8be2e2d80990a1250aeffd4e4eb79ea3266 (HEAD -> master, MyBranch)
Author: Thach Hoang <hoangthach2502@gmail.com>
Date: Sun Jun 23 19:21:50 2019 +0700
update2
commit 260d9c7f281f643992790187138880ef7d9e2ed0 (origin/master, origin/HEAD)
Merge: e37ef5f 0414088
Author: hoangthach252 <hoangthach2502@gmail.com>
Date: Thu Jun 20 18:12:26 2019 +0700
Merge pull request #21 from hoangthach252/zenauto-patch-1
Create Pull Request Template
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (master)
$ git checkout -b MyBranch2
Switched to a new branch 'MyBranch2'
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (MyBranch2)
$ git status
On branch MyBranch2
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: readme.txt
no changes added to commit (use "git add" and/or "git commit -a")
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (MyBranch2)
$ git add readme.txt
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (MyBranch2)
$ git status
On branch MyBranch2
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: readme.txt
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (MyBranch2)
$ git commit -m "update3"
[MyBranch2 bfe36c1] update3
1 file changed, 1 insertion(+)
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (MyBranch2)
$ git checkout MyBranch
Switched to branch 'MyBranch'
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (MyBranch)
$ git status
On branch MyBranch
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: readme.txt
no changes added to commit (use "git add" and/or "git commit -a")
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (MyBranch)
$ git add readme.txt
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (MyBranch)
$ git status
On branch MyBranch
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: readme.txt
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (MyBranch)
$ git commit -m "update4"
[MyBranch f875ef5] update4
1 file changed, 1 insertion(+)
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (MyBranch)
$ git merge MyBranch2
Auto-merging readme.txt
CONFLICT (content): Merge conflict in readme.txt
Automatic merge failed; fix conflicts and then commit the result.
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (MyBranch|MERGING)
$ git status
On branch MyBranch
You have unmerged paths.
(fix conflicts and run "git commit")
(use "git merge --abort" to abort the merge)
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: readme.txt
no changes added to commit (use "git add" and/or "git commit -a")
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (MyBranch|MERGING)
$ git add readme.txt
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (MyBranch|MERGING)
$ git status
On branch MyBranch
All conflicts fixed but you are still merging.
(use "git commit" to conclude merge)
Changes to be committed:
modified: readme.txt
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (MyBranch|MERGING)
$ git commit
[MyBranch 81048fa] Merge branch 'MyBranch2' into MyBranch
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (MyBranch)
$ git log
commit 81048fad242c338f2e17f645f3ef00075e5f740a (HEAD -> MyBranch)
Merge: f875ef5 bfe36c1
Author: Thach Hoang <hoangthach2502@gmail.com>
Date: Sun Jun 23 19:27:07 2019 +0700
Merge branch 'MyBranch2' into MyBranch
commit f875ef59fa1dc611dbec270bef89f97038878641
Author: Thach Hoang <hoangthach2502@gmail.com>
Date: Sun Jun 23 19:26:09 2019 +0700
update4
commit bfe36c177f86746563467069cca7766bc78979ec (MyBranch2)
Author: Thach Hoang <hoangthach2502@gmail.com>
Date: Sun Jun 23 19:25:18 2019 +0700
update3
commit b033a8be2e2d80990a1250aeffd4e4eb79ea3266 (master)
Author: Thach Hoang <hoangthach2502@gmail.com>
Date: Sun Jun 23 19:21:50 2019 +0700
update2
commit 260d9c7f281f643992790187138880ef7d9e2ed0 (origin/master, origin/HEAD)
Merge: e37ef5f 0414088
Author: hoangthach252 <hoangthach2502@gmail.com>
Date: Thu Jun 20 18:12:26 2019 +0700
Merge pull request #21 from hoangthach252/zenauto-patch-1
Create Pull Request Template
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (MyBranch)
$
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (MyBranch)
$ git remote
origin
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (MyBranch)
$ git remote -v
origin https://github.com/hoangthach252/AutoCucumberFramework.git (fetch)
origin https://github.com/hoangthach252/AutoCucumberFramework.git (push)
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (MyBranch)
$ git fetch origin
Username for 'https://github.com': hoangthach252
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (MyBranch)
$ git pull origin
Username for 'https://github.com': hoangthach252
You asked to pull from the remote 'origin', but did not specify
a branch. Because this is not the default configured remote
for your current branch, you must specify a branch on the command line.
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (MyBranch)
$ git pull origin master
Username for 'https://github.com': hoangthach252
From https://github.com/hoangthach252/AutoCucumberFramework
* branch master -> FETCH_HEAD
Already up to date.
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (MyBranch)
$ git remote add GitLabRepo https://gitlab.com/hoangthach252/Autocucumber.git
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (MyBranch)
$ git remote
GitLabRepo
origin
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (MyBranch)
$ git remote -v
GitLabRepo https://gitlab.com/hoangthach252/Autocucumber.git (fetch)
GitLabRepo https://gitlab.com/hoangthach252/Autocucumber.git (push)
origin https://github.com/hoangthach252/AutoCucumberFramework.git (fetch)
origin https://github.com/hoangthach252/AutoCucumberFramework.git (push)
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (MyBranch)
$ git checkout master
Switched to branch 'master'
Your branch is ahead of 'origin/master' by 1 commit.
(use "git push" to publish your local commits)
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (master)
$
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (master)
$
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (master)
$ git fetch origin master
Username for 'https://github.com': hoangthach252
From https://github.com/hoangthach252/AutoCucumberFramework
* branch master -> FETCH_HEAD
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (master)
$ git pull
Username for 'https://github.com': hoangthach252
Already up to date.
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (master)
$ git checkout MyBranch
D BDD-Java-Framework/.gitignore
D BDD-Java-Framework/.idea/.name
D BDD-Java-Framework/.idea/compiler.xml
D BDD-Java-Framework/.idea/encodings.xml
D BDD-Java-Framework/.idea/misc.xml
D BDD-Java-Framework/.idea/uiDesigner.xml
D BDD-Java-Framework/.idea/workspace.xml
D BDD-Java-Framework/README.md
D BDD-Java-Framework/Zenfolio-AutoFramework.iml
D BDD-Java-Framework/autotests-core/autotestscore.iml
D BDD-Java-Framework/autotests-core/pom.xml
D BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/configuration/AbstractTestNGCucumberParallelTests.java
D BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/configuration/AbstractTestNGCukesTest.java
D BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/configuration/CukesTestRunner.java
D BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/configuration/CukesTestRunnerParallel.java
D BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/configuration/CustomWebDriverProvider.java
D BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/configuration/ZenConfiguration.java
D BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/hooks/gmail/GmailApi.java
D BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/hooks/gmail/GmailHelper.java
D BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/pages/BasePage.java
D BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/pages/EVPage/HomePage.java
D BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/pages/EVPage/LoginPage.java
D BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/pages/EVPage/MainPage.java
D BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/pages/EVPage/PendingOrdersPage.java
D BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/pages/EVPage/SellingDashboardPage.java
D BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/pages/VVPages/BuyPhotoPage.java
D BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/pages/VVPages/CheckOutPage.java
D BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/pages/VVPages/ClientGalleriesPage.java
D BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/pages/VVPages/PortfolioPage.java
D BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/AbstractStep.java
D BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/CukesHook.java
D BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/EVPages/HomePageSteps.java
D BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/EVPages/Login_Steps.java
D BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/EVPages/PendingOrdersSteps.java
D BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/EVPages/PreOrderSteps.java
D BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/EVPages/SellingDashboardSteps.java
D BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/GmailHelperSteps.java
D BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/PromoPageSteps.java
D BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/VVPages/CheckOutSteps.java
D BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/VVPages/ClientGalleriesPageSteps.java
D BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/VVPages/PortfolioPageSteps.java
D BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/World.java
D BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/testdata/CommonData.java
D BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/testdata/URLPathData.java
D BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/utils/Context.java
D BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/utils/Datahelper.java
D BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/utils/ObjectMap.java
D BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/utils/Props.java
D BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/utils/RandomUtils.java
Switched to branch 'MyBranch'
D BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/utils/ScenarioContext.java
D BDD-Java-Framework/autotests-core/src/test/resources/RegressionTestNGSuite.xml
D BDD-Java-Framework/autotests-core/src/test/resources/credentials.json
D BDD-Java-Framework/autotests-core/src/test/resources/environment.properties
D BDD-Java-Framework/autotests-core/src/test/resources/features/Login.feature
D BDD-Java-Framework/autotests-core/src/test/resources/features/PreOrder.feature
D BDD-Java-Framework/autotests-core/src/test/resources/features/QuickShop_MPix_Products.feature
D BDD-Java-Framework/autotests-core/src/test/resources/features/QuickShop_ManualApproval.feature
D BDD-Java-Framework/autotests-core/src/test/resources/features/ShopHome_MPix_Products.feature
D BDD-Java-Framework/autotests-core/src/test/resources/locators.properties
D BDD-Java-Framework/autotests-core/src/test/resources/profiles/stage/env_config.properties
D BDD-Java-Framework/autotests-core/src/test/resources/profiles/test/env_config.properties
D BDD-Java-Framework/autotests-core/src/test/resources/spring.xml
D BDD-Java-Framework/pom.xml
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (MyBranch)
$ git branch -D master
Deleted branch master (was b033a8b).
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (master)
$ git status
On branch master
Your branch is up to date with 'origin/master'.
Changes not staged for commit:
(use "git add/rm <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
deleted: BDD-Java-Framework/.gitignore
deleted: BDD-Java-Framework/.idea/.name
deleted: BDD-Java-Framework/.idea/compiler.xml
deleted: BDD-Java-Framework/.idea/encodings.xml
deleted: BDD-Java-Framework/.idea/misc.xml
deleted: BDD-Java-Framework/.idea/uiDesigner.xml
deleted: BDD-Java-Framework/.idea/workspace.xml
deleted: BDD-Java-Framework/README.md
deleted: BDD-Java-Framework/Zenfolio-AutoFramework.iml
deleted: BDD-Java-Framework/autotests-core/autotestscore.iml
deleted: BDD-Java-Framework/autotests-core/pom.xml
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/configuration/AbstractTestNGCucumberParallelTests.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/configuration/AbstractTestNGCukesTest.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/configuration/CukesTestRunner.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/configuration/CukesTestRunnerParallel.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/configuration/CustomWebDriverProvider.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/configuration/ZenConfiguration.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/hooks/gmail/GmailApi.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/hooks/gmail/GmailHelper.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/pages/BasePage.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/pages/EVPage/HomePage.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/pages/EVPage/LoginPage.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/pages/EVPage/MainPage.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/pages/EVPage/PendingOrdersPage.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/pages/EVPage/SellingDashboardPage.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/pages/VVPages/BuyPhotoPage.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/pages/VVPages/CheckOutPage.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/pages/VVPages/ClientGalleriesPage.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/pages/VVPages/PortfolioPage.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/AbstractStep.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/CukesHook.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/EVPages/HomePageSteps.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/EVPages/Login_Steps.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/EVPages/PendingOrdersSteps.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/EVPages/PreOrderSteps.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/EVPages/SellingDashboardSteps.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/GmailHelperSteps.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/PromoPageSteps.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/VVPages/CheckOutSteps.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/VVPages/ClientGalleriesPageSteps.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/VVPages/PortfolioPageSteps.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/World.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/testdata/CommonData.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/testdata/URLPathData.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/utils/Context.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/utils/Datahelper.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/utils/ObjectMap.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/utils/Props.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/utils/RandomUtils.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/utils/ScenarioContext.java
deleted: BDD-Java-Framework/autotests-core/src/test/resources/RegressionTestNGSuite.xml
deleted: BDD-Java-Framework/autotests-core/src/test/resources/credentials.json
deleted: BDD-Java-Framework/autotests-core/src/test/resources/environment.properties
deleted: BDD-Java-Framework/autotests-core/src/test/resources/features/Login.feature
deleted: BDD-Java-Framework/autotests-core/src/test/resources/features/PreOrder.feature
deleted: BDD-Java-Framework/autotests-core/src/test/resources/features/QuickShop_MPix_Products.feature
deleted: BDD-Java-Framework/autotests-core/src/test/resources/features/QuickShop_ManualApproval.feature
deleted: BDD-Java-Framework/autotests-core/src/test/resources/features/ShopHome_MPix_Products.feature
deleted: BDD-Java-Framework/autotests-core/src/test/resources/locators.properties
deleted: BDD-Java-Framework/autotests-core/src/test/resources/profiles/stage/env_config.properties
deleted: BDD-Java-Framework/autotests-core/src/test/resources/profiles/test/env_config.properties
deleted: BDD-Java-Framework/autotests-core/src/test/resources/spring.xml
deleted: BDD-Java-Framework/pom.xml
no changes added to commit (use "git add" and/or "git commit -a")
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (master)
$ git add BDD-Java-Framework
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (master)
$ git status
On branch master
Your branch is up to date with 'origin/master'.
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
deleted: BDD-Java-Framework/.gitignore
deleted: BDD-Java-Framework/.idea/.name
deleted: BDD-Java-Framework/.idea/compiler.xml
deleted: BDD-Java-Framework/.idea/encodings.xml
deleted: BDD-Java-Framework/.idea/misc.xml
deleted: BDD-Java-Framework/.idea/uiDesigner.xml
deleted: BDD-Java-Framework/.idea/workspace.xml
deleted: BDD-Java-Framework/README.md
deleted: BDD-Java-Framework/Zenfolio-AutoFramework.iml
deleted: BDD-Java-Framework/autotests-core/autotestscore.iml
deleted: BDD-Java-Framework/autotests-core/pom.xml
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/configuration/AbstractTestNGCucumberParallelTests.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/configuration/AbstractTestNGCukesTest.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/configuration/CukesTestRunner.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/configuration/CukesTestRunnerParallel.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/configuration/CustomWebDriverProvider.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/configuration/ZenConfiguration.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/hooks/gmail/GmailApi.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/hooks/gmail/GmailHelper.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/pages/BasePage.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/pages/EVPage/HomePage.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/pages/EVPage/LoginPage.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/pages/EVPage/MainPage.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/pages/EVPage/PendingOrdersPage.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/pages/EVPage/SellingDashboardPage.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/pages/VVPages/BuyPhotoPage.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/pages/VVPages/CheckOutPage.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/pages/VVPages/ClientGalleriesPage.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/pages/VVPages/PortfolioPage.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/AbstractStep.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/CukesHook.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/EVPages/HomePageSteps.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/EVPages/Login_Steps.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/EVPages/PendingOrdersSteps.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/EVPages/PreOrderSteps.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/EVPages/SellingDashboardSteps.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/GmailHelperSteps.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/PromoPageSteps.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/VVPages/CheckOutSteps.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/VVPages/ClientGalleriesPageSteps.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/VVPages/PortfolioPageSteps.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/World.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/testdata/CommonData.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/testdata/URLPathData.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/utils/Context.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/utils/Datahelper.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/utils/ObjectMap.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/utils/Props.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/utils/RandomUtils.java
deleted: BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/utils/ScenarioContext.java
deleted: BDD-Java-Framework/autotests-core/src/test/resources/RegressionTestNGSuite.xml
deleted: BDD-Java-Framework/autotests-core/src/test/resources/credentials.json
deleted: BDD-Java-Framework/autotests-core/src/test/resources/environment.properties
deleted: BDD-Java-Framework/autotests-core/src/test/resources/features/Login.feature
deleted: BDD-Java-Framework/autotests-core/src/test/resources/features/PreOrder.feature
deleted: BDD-Java-Framework/autotests-core/src/test/resources/features/QuickShop_MPix_Products.feature
deleted: BDD-Java-Framework/autotests-core/src/test/resources/features/QuickShop_ManualApproval.feature
deleted: BDD-Java-Framework/autotests-core/src/test/resources/features/ShopHome_MPix_Products.feature
deleted: BDD-Java-Framework/autotests-core/src/test/resources/locators.properties
deleted: BDD-Java-Framework/autotests-core/src/test/resources/profiles/stage/env_config.properties
deleted: BDD-Java-Framework/autotests-core/src/test/resources/profiles/test/env_config.properties
deleted: BDD-Java-Framework/autotests-core/src/test/resources/spring.xml
deleted: BDD-Java-Framework/pom.xml
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (master)
$ git commit -m "mistake "
[master 8e15dca] mistake
63 files changed, 5393 deletions(-)
delete mode 100644 BDD-Java-Framework/.gitignore
delete mode 100644 BDD-Java-Framework/.idea/.name
delete mode 100644 BDD-Java-Framework/.idea/compiler.xml
delete mode 100644 BDD-Java-Framework/.idea/encodings.xml
delete mode 100644 BDD-Java-Framework/.idea/misc.xml
delete mode 100644 BDD-Java-Framework/.idea/uiDesigner.xml
delete mode 100644 BDD-Java-Framework/.idea/workspace.xml
delete mode 100644 BDD-Java-Framework/README.md
delete mode 100644 BDD-Java-Framework/Zenfolio-AutoFramework.iml
delete mode 100644 BDD-Java-Framework/autotests-core/autotestscore.iml
delete mode 100644 BDD-Java-Framework/autotests-core/pom.xml
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/configuration/AbstractTestNGCucumberParallelTests.java
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/configuration/AbstractTestNGCukesTest.java
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/configuration/CukesTestRunner.java
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/configuration/CukesTestRunnerParallel.java
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/configuration/CustomWebDriverProvider.java
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/configuration/ZenConfiguration.java
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/hooks/gmail/GmailApi.java
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/hooks/gmail/GmailHelper.java
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/pages/BasePage.java
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/pages/EVPage/HomePage.java
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/pages/EVPage/LoginPage.java
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/pages/EVPage/MainPage.java
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/pages/EVPage/PendingOrdersPage.java
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/pages/EVPage/SellingDashboardPage.java
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/pages/VVPages/BuyPhotoPage.java
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/pages/VVPages/CheckOutPage.java
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/pages/VVPages/ClientGalleriesPage.java
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/pages/VVPages/PortfolioPage.java
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/AbstractStep.java
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/CukesHook.java
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/EVPages/HomePageSteps.java
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/EVPages/Login_Steps.java
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/EVPages/PendingOrdersSteps.java
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/EVPages/PreOrderSteps.java
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/EVPages/SellingDashboardSteps.java
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/GmailHelperSteps.java
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/PromoPageSteps.java
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/VVPages/CheckOutSteps.java
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/VVPages/ClientGalleriesPageSteps.java
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/VVPages/PortfolioPageSteps.java
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/stepdefs/World.java
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/testdata/CommonData.java
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/testdata/URLPathData.java
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/utils/Context.java
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/utils/Datahelper.java
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/utils/ObjectMap.java
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/utils/Props.java
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/utils/RandomUtils.java
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/java/zen/autotests/utils/ScenarioContext.java
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/resources/RegressionTestNGSuite.xml
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/resources/credentials.json
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/resources/environment.properties
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/resources/features/Login.feature
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/resources/features/PreOrder.feature
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/resources/features/QuickShop_MPix_Products.feature
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/resources/features/QuickShop_ManualApproval.feature
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/resources/features/ShopHome_MPix_Products.feature
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/resources/locators.properties
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/resources/profiles/stage/env_config.properties
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/resources/profiles/test/env_config.properties
delete mode 100644 BDD-Java-Framework/autotests-core/src/test/resources/spring.xml
delete mode 100644 BDD-Java-Framework/pom.xml
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (master)
$ git log
commit 8e15dca55914a8c7ef611fafc4830f648c3de10a (HEAD -> master)
Author: Thach Hoang <hoangthach2502@gmail.com>
Date: Sun Jun 23 19:37:40 2019 +0700
mistake
commit 260d9c7f281f643992790187138880ef7d9e2ed0 (origin/master, origin/HEAD)
Merge: e37ef5f 0414088
Author: hoangthach252 <hoangthach2502@gmail.com>
Date: Thu Jun 20 18:12:26 2019 +0700
Merge pull request #21 from hoangthach252/zenauto-patch-1
Create Pull Request Template
commit 04140887279d2ee736654b722fde997b03639f1a (origin/zenauto-patch-1)
Author: hoangthach252 <hoangthach2502@gmail.com>
Date: Thu Jun 20 17:54:46 2019 +0700
Create Pull Request Template
commit e37ef5fb5b7aa7256de2c97558cd3d5fa18e4483
Merge: 3ff161a b8ef439
Author: hoangthach252 <hoangthach2502@gmail.com>
Date: Thu Jun 20 14:35:15 2019 +0700
Merge pull request #20 from hoangthach252/refactorWebDriver
refactor Webdriver and using multi cards to purchase
commit b8ef439333ab8c5dea26eae8e3fe19eda79523f1 (origin/refactorWebDriver)
Author: Thach Hoang <hoangthach2502@gmail.com>
Date: Fri Jun 14 19:43:15 2019 +0700
refactor Webdriver and using multi cards to purchase
commit 3ff161a6e1206db63f7af76e27d232bd85b6e919 (origin/hung-test)
Merge: 6f905e2 60f1827
Author: hoangthach252 <hoangthach2502@gmail.com>
Date: Thu Jun 13 12:59:00 2019 +0700
Merge pull request #18 from hoangthach252/addCustomWebDriverToClearCookies
Refactor: addCustomWebDriverToClearCookies
commit 60f1827ef3dc6ed4ea4944988aab3f0bce4bbca3 (origin/addCustomWebDriverToClearCookies)
Author: Thach Hoang <hoangthach2502@gmail.com>
Date: Thu Jun 13 12:58:08 2019 +0700
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (master)
$
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (master)
$
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (master)
$ git stastus
git: 'stastus' is not a git command. See 'git --help'.
The most similar command is
status
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (master)
$ git status
On branch master
Your branch is ahead of 'origin/master' by 1 commit.
(use "git push" to publish your local commits)
nothing to commit, working tree clean
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (master)
$ git checkout MyBranch
Switched to branch 'MyBranch'
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (MyBranch)
$ git branch -D master
Deleted branch master (was 8e15dca).
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (MyBranch)
$ git checkout master
Switched to a new branch 'master'
Branch 'master' set up to track remote branch 'master' from 'origin'.
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (master)
$
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (master)
$
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (master)
$ git log
commit 260d9c7f281f643992790187138880ef7d9e2ed0 (HEAD -> master, origin/master, origin/HEAD)
Merge: e37ef5f 0414088
Author: hoangthach252 <hoangthach2502@gmail.com>
Date: Thu Jun 20 18:12:26 2019 +0700
Merge pull request #21 from hoangthach252/zenauto-patch-1
Create Pull Request Template
commit 04140887279d2ee736654b722fde997b03639f1a (origin/zenauto-patch-1)
Author: hoangthach252 <hoangthach2502@gmail.com>
Date: Thu Jun 20 17:54:46 2019 +0700
Create Pull Request Template
commit e37ef5fb5b7aa7256de2c97558cd3d5fa18e4483
Merge: 3ff161a b8ef439
Author: hoangthach252 <hoangthach2502@gmail.com>
Date: Thu Jun 20 14:35:15 2019 +0700
Merge pull request #20 from hoangthach252/refactorWebDriver
refactor Webdriver and using multi cards to purchase
commit b8ef439333ab8c5dea26eae8e3fe19eda79523f1 (origin/refactorWebDriver)
Author: Thach Hoang <hoangthach2502@gmail.com>
Date: Fri Jun 14 19:43:15 2019 +0700
refactor Webdriver and using multi cards to purchase
commit 3ff161a6e1206db63f7af76e27d232bd85b6e919 (origin/hung-test)
Merge: 6f905e2 60f1827
Author: hoangthach252 <hoangthach2502@gmail.com>
Date: Thu Jun 13 12:59:00 2019 +0700
Merge pull request #18 from hoangthach252/addCustomWebDriverToClearCookies
Refactor: addCustomWebDriverToClearCookies
commit 60f1827ef3dc6ed4ea4944988aab3f0bce4bbca3 (origin/addCustomWebDriverToClearCookies)
Author: Thach Hoang <hoangthach2502@gmail.com>
Date: Thu Jun 13 12:58:08 2019 +0700
fix variable names
commit 979a5f39b40438849cd8ab80f873f40d5a2bf857
Author: Thach Hoang <hoangthach2502@gmail.com>
Date: Wed Jun 12 16:03:23 2019 +0700
Administrator@Admin MINGW64 /e/Training/AutoCucumberFramework (master)
$
Step Up Automation 