git work flow in internship project in ITG (This is for myself for future reference)
pull -> changed the file -> created a issue in gitlab -> base entity addition ->changed the project->integrated my gitlab account in git bash->add the file in the local repository that is my computer ->push all the changes but first create a hash #number as a branch in gitlab so we can recognize changes easily.It is also a best practice ->Push into that branch -> create a new change -> create a new issue->create a new branch-> add file in local repo-> push into the new branch->
and the cycle continues .
Access to the master branch was not given to me
In the end created a prod branch and create a new hash file and push all the changes to prod branch and completed my internship project.
Below is copy and paste of command used.
Microsoft Windows [Version 10.0.16299.192]
(c) 2017 Microsoft Corporation. All rights reserved.
C:\Users\dell company\Documents\It Glance\Internship\POS2\pointonsale>git status -s
M src/main/java/org/itglance/pointonsale/domain/Items.java
M src/main/resources/data/changelog/constrain/db.changelog-itemsConst.xml
R src/main/resources/data/changelog/constrain/db.changelog-manufactures_itemsConst.xml -> src/main/resources/data/changelog/constrain/db.changelog-ma
nufacturers_itemsConst.xml
AM src/main/resources/data/changelog/csv/branches.csv
AM src/main/resources/data/changelog/csv/branches_transactions.csv
AM src/main/resources/data/changelog/csv/categories.csv
A src/main/resources/data/changelog/csv/employee_logs.csv
AM src/main/resources/data/changelog/csv/expenses.csv
AM src/main/resources/data/changelog/csv/item_rate.csv
AM src/main/resources/data/changelog/csv/item_return.csv
AM src/main/resources/data/changelog/csv/items.csv
AM src/main/resources/data/changelog/csv/login.csv
A src/main/resources/data/changelog/csv/login_role.csv
A src/main/resources/data/changelog/csv/manufacturers.csv
A src/main/resources/data/changelog/csv/manufacturers_items.csv
AM src/main/resources/data/changelog/csv/payments.csv
AM src/main/resources/data/changelog/csv/role.csv
AM src/main/resources/data/changelog/csv/sales.csv
AM src/main/resources/data/changelog/csv/transactions.csv
AM src/main/resources/data/changelog/csv/users.csv
A src/main/resources/data/changelog/csv/users_sales.csv
M src/main/resources/data/changelog/db.changelog-items.xml
RM src/main/resources/data/changelog/db.changelog-manufactures.xml -> src/main/resources/data/changelog/db.changelog-manufacturers.xml
RM src/main/resources/data/changelog/db.changelog-manufactures_items.xml -> src/main/resources/data/changelog/db.changelog-manufacturers_items.xml
M src/main/resources/data/changelog/db.changelog-master.xml
M src/main/resources/data/changelog/db.changelog-users.xml
AM src/main/resources/data/changelog/loader/db.changelog-loginValue.xml
AM src/main/resources/data/changelog/loader/db.changelog-login_roleValue.xml
AM src/main/resources/data/changelog/loader/db.changelog-roleValue.xml
AM src/main/resources/data/changelog/loader/db.changelog-usersValue.xml
C:\Users\dell company\Documents\It Glance\Internship\POS2\pointonsale>git checkout pointonsale#3
Switched to branch 'pointonsale#3'
M src/main/java/org/itglance/pointonsale/domain/Items.java
M src/main/resources/data/changelog/constrain/db.changelog-itemsConst.xml
A src/main/resources/data/changelog/constrain/db.changelog-manufacturers_itemsConst.xml
D src/main/resources/data/changelog/constrain/db.changelog-manufactures_itemsConst.xml
A src/main/resources/data/changelog/csv/branches.csv
A src/main/resources/data/changelog/csv/branches_transactions.csv
A src/main/resources/data/changelog/csv/categories.csv
A src/main/resources/data/changelog/csv/employee_logs.csv
A src/main/resources/data/changelog/csv/expenses.csv
A src/main/resources/data/changelog/csv/item_rate.csv
A src/main/resources/data/changelog/csv/item_return.csv
A src/main/resources/data/changelog/csv/items.csv
A src/main/resources/data/changelog/csv/login.csv
A src/main/resources/data/changelog/csv/login_role.csv
A src/main/resources/data/changelog/csv/manufacturers.csv
A src/main/resources/data/changelog/csv/manufacturers_items.csv
A src/main/resources/data/changelog/csv/payments.csv
A src/main/resources/data/changelog/csv/role.csv
A src/main/resources/data/changelog/csv/sales.csv
A src/main/resources/data/changelog/csv/transactions.csv
A src/main/resources/data/changelog/csv/users.csv
A src/main/resources/data/changelog/csv/users_sales.csv
M src/main/resources/data/changelog/db.changelog-items.xml
A src/main/resources/data/changelog/db.changelog-manufacturers.xml
A src/main/resources/data/changelog/db.changelog-manufacturers_items.xml
D src/main/resources/data/changelog/db.changelog-manufactures.xml
D src/main/resources/data/changelog/db.changelog-manufactures_items.xml
M src/main/resources/data/changelog/db.changelog-master.xml
M src/main/resources/data/changelog/db.changelog-users.xml
A src/main/resources/data/changelog/loader/db.changelog-loginValue.xml
A src/main/resources/data/changelog/loader/db.changelog-login_roleValue.xml
A src/main/resources/data/changelog/loader/db.changelog-roleValue.xml
A src/main/resources/data/changelog/loader/db.changelog-usersValue.xml
C:\Users\dell company\Documents\It Glance\Internship\POS2\pointonsale>git status -s
M src/main/java/org/itglance/pointonsale/domain/Items.java
M src/main/resources/data/changelog/constrain/db.changelog-itemsConst.xml
R src/main/resources/data/changelog/constrain/db.changelog-manufactures_itemsConst.xml -> src/main/resources/data/changelog/constrain/db.changelog-ma
nufacturers_itemsConst.xml
AM src/main/resources/data/changelog/csv/branches.csv
AM src/main/resources/data/changelog/csv/branches_transactions.csv
AM src/main/resources/data/changelog/csv/categories.csv
A src/main/resources/data/changelog/csv/employee_logs.csv
AM src/main/resources/data/changelog/csv/expenses.csv
AM src/main/resources/data/changelog/csv/item_rate.csv
AM src/main/resources/data/changelog/csv/item_return.csv
AM src/main/resources/data/changelog/csv/items.csv
AM src/main/resources/data/changelog/csv/login.csv
A src/main/resources/data/changelog/csv/login_role.csv
A src/main/resources/data/changelog/csv/manufacturers.csv
A src/main/resources/data/changelog/csv/manufacturers_items.csv
AM src/main/resources/data/changelog/csv/payments.csv
AM src/main/resources/data/changelog/csv/role.csv
AM src/main/resources/data/changelog/csv/sales.csv
AM src/main/resources/data/changelog/csv/transactions.csv
AM src/main/resources/data/changelog/csv/users.csv
A src/main/resources/data/changelog/csv/users_sales.csv
M src/main/resources/data/changelog/db.changelog-items.xml
RM src/main/resources/data/changelog/db.changelog-manufactures.xml -> src/main/resources/data/changelog/db.changelog-manufacturers.xml
RM src/main/resources/data/changelog/db.changelog-manufactures_items.xml -> src/main/resources/data/changelog/db.changelog-manufacturers_items.xml
M src/main/resources/data/changelog/db.changelog-master.xml
M src/main/resources/data/changelog/db.changelog-users.xml
AM src/main/resources/data/changelog/loader/db.changelog-loginValue.xml
AM src/main/resources/data/changelog/loader/db.changelog-login_roleValue.xml
AM src/main/resources/data/changelog/loader/db.changelog-roleValue.xml
AM src/main/resources/data/changelog/loader/db.changelog-usersValue.xml
C:\Users\dell company\Documents\It Glance\Internship\POS2\pointonsale>git add .
C:\Users\dell company\Documents\It Glance\Internship\POS2\pointonsale>git branch
master
pointonsale#1
pointonsale#2
* pointonsale#3
C:\Users\dell company\Documents\It Glance\Internship\POS2\pointonsale>git commit -m "#3 liquibase integrated and csv file added for user_login"
[pointonsale#3 1953940] #3 liquibase integrated and csv file added for user_login
30 files changed, 115 insertions(+), 16 deletions(-)
rename src/main/resources/data/changelog/constrain/{db.changelog-manufactures_itemsConst.xml => db.changelog-manufacturers_itemsConst.xml} (65%)
create mode 100644 src/main/resources/data/changelog/csv/branches.csv
create mode 100644 src/main/resources/data/changelog/csv/branches_transactions.csv
create mode 100644 src/main/resources/data/changelog/csv/categories.csv
create mode 100644 src/main/resources/data/changelog/csv/employee_logs.csv
create mode 100644 src/main/resources/data/changelog/csv/expenses.csv
create mode 100644 src/main/resources/data/changelog/csv/item_rate.csv
create mode 100644 src/main/resources/data/changelog/csv/item_return.csv
create mode 100644 src/main/resources/data/changelog/csv/items.csv
create mode 100644 src/main/resources/data/changelog/csv/login.csv
create mode 100644 src/main/resources/data/changelog/csv/login_role.csv
create mode 100644 src/main/resources/data/changelog/csv/manufacturers.csv
create mode 100644 src/main/resources/data/changelog/csv/manufacturers_items.csv
create mode 100644 src/main/resources/data/changelog/csv/payments.csv
create mode 100644 src/main/resources/data/changelog/csv/role.csv
create mode 100644 src/main/resources/data/changelog/csv/sales.csv
create mode 100644 src/main/resources/data/changelog/csv/transactions.csv
create mode 100644 src/main/resources/data/changelog/csv/users.csv
create mode 100644 src/main/resources/data/changelog/csv/users_sales.csv
rename src/main/resources/data/changelog/{db.changelog-manufactures.xml => db.changelog-manufacturers.xml} (92%)
rename src/main/resources/data/changelog/{db.changelog-manufactures_items.xml => db.changelog-manufacturers_items.xml} (83%)
create mode 100644 src/main/resources/data/changelog/loader/db.changelog-loginValue.xml
create mode 100644 src/main/resources/data/changelog/loader/db.changelog-login_roleValue.xml
create mode 100644 src/main/resources/data/changelog/loader/db.changelog-roleValue.xml
create mode 100644 src/main/resources/data/changelog/loader/db.changelog-usersValue.xml
C:\Users\dell company\Documents\It Glance\Internship\POS2\pointonsale>git push origin pointonsale#3
Counting objects: 43, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (29/29), done.
Writing objects: 100% (43/43), 4.36 KiB | 372.00 KiB/s, done.
Total 43 (delta 16), reused 0 (delta 0)
remote:
remote: To create a merge request for pointonsale#3, visit:
remote: https://gitlab.com/nischalshakya95/pointonsale/merge_requests/new?merge_request%5Bsource_branch%5D=pointonsale%233
remote:
To https://gitlab.com/nischalshakya95/pointonsale.git
22f3b2c..1953940 pointonsale#3 -> pointonsale#3
C:\Users\dell company\Documents\It Glance\Internship\POS2\pointonsale>clear
C:\Users\dell company\Documents\It Glance\Internship\POS2\pointonsale>ls
mvnw mvnw.cmd pom.xml src target
C:\Users\dell company\Documents\It Glance\Internship\POS2\pointonsale>clear
C:\Users\dell company\Documents\It Glance\Internship\POS2\pointonsale>
C:\Users\dell company\Documents\It Glance\Internship\POS2\pointonsale>git checkout master
Switched to branch 'master'
Your branch is ahead of 'origin/master' by 5 commits.
(use "git push" to publish your local commits)
C:\Users\dell company\Documents\It Glance\Internship\POS2\pointonsale>git branch
* master
pointonsale#1
pointonsale#2
pointonsale#3
C:\Users\dell company\Documents\It Glance\Internship\POS2\pointonsale>git branch pointonsale#4
C:\Users\dell company\Documents\It Glance\Internship\POS2\pointonsale>git checkout pointonsale#4
Switched to branch 'pointonsale#4'
C:\Users\dell company\Documents\It Glance\Internship\POS2\pointonsale>clear
C:\Users\dell company\Documents\It Glance\Internship\POS2\pointonsale>
clear
C:\Users\dell company\Documents\It Glance\Internship\POS2\pointonsale>git status 0s\
On branch pointonsale#4
nothing to commit, working tree clean
C:\Users\dell company\Documents\It Glance\Internship\POS2\pointonsale>git status -s
M pom.xml
AM src/main/java/org/itglance/pointonsale/config/SwaggerConfig.java
AM src/main/java/org/itglance/pointonsale/constant/ConstantConfiguration.java
M src/main/java/org/itglance/pointonsale/web/rest/ExpenseApi.java
M src/main/java/org/itglance/pointonsale/web/rest/InventoryApi.java
M src/main/java/org/itglance/pointonsale/web/rest/SaleApi.java
M src/main/java/org/itglance/pointonsale/web/rest/TransactionApi.java
M src/main/java/org/itglance/pointonsale/web/rest/UserApi.java
M src/main/resources/application.yml
C:\Users\dell company\Documents\It Glance\Internship\POS2\pointonsale>git add .
C:\Users\dell company\Documents\It Glance\Internship\POS2\pointonsale>git commit -m "#4 swagger integrated"
[pointonsale#4 3b38a9d] #4 swagger integrated
9 files changed, 176 insertions(+), 19 deletions(-)
create mode 100644 src/main/java/org/itglance/pointonsale/config/SwaggerConfig.java
create mode 100644 src/main/java/org/itglance/pointonsale/constant/ConstantConfiguration.java
C:\Users\dell company\Documents\It Glance\Internship\POS2\pointonsale>git push origin pointonsale#4
Counting objects: 22, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (17/17), done.
Writing objects: 100% (22/22), 4.18 KiB | 203.00 KiB/s, done.
Total 22 (delta 9), reused 0 (delta 0)
remote:
remote: To create a merge request for pointonsale#4, visit:
remote: https://gitlab.com/nischalshakya95/pointonsale/merge_requests/new?merge_request%5Bsource_branch%5D=pointonsale%234
remote:
To https://gitlab.com/nischalshakya95/pointonsale.git
* [new branch] pointonsale#4 -> pointonsale#4
C:\Users\dell company\Documents\It Glance\Internship\POS2\pointonsale>kclear
'kclear' is not recognized as an internal or external command,
operable program or batch file.
C:\Users\dell company\Documents\It Glance\Internship\POS2\pointonsale>clear
C:\Users\dell company\Documents\It Glance\Internship\POS2\pointonsale>git checkout master
Switched to branch 'master'
Your branch is ahead of 'origin/master' by 5 commits.
(use "git push" to publish your local commits)
C:\Users\dell company\Documents\It Glance\Internship\POS2\pointonsale>git branch prod
C:\Users\dell company\Documents\It Glance\Internship\POS2\pointonsale>git checkout prod
Switched to branch 'prod'
C:\Users\dell company\Documents\It Glance\Internship\POS2\pointonsale>git push origin prod
Total 0 (delta 0), reused 0 (delta 0)
remote:
remote: To create a merge request for prod, visit:
remote: https://gitlab.com/nischalshakya95/pointonsale/merge_requests/new?merge_request%5Bsource_branch%5D=prod
remote:
To https://gitlab.com/nischalshakya95/pointonsale.git
* [new branch] prod -> prod
C:\Users\dell company\Documents\It Glance\Internship\POS2\pointonsale>clear
C:\Users\dell company\Documents\It Glance\Internship\POS2\pointonsale>git pull
remote: Counting objects: 1, done.
remote: Total 1 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (1/1), done.
From https://gitlab.com/nischalshakya95/pointonsale
* [new branch] 4-integration-of-liquibase -> origin/4-integration-of-liquibase
22f3b2c..a0f3c61 prod -> origin/prod
There is no tracking information for the current branch.
Please specify which branch you want to merge with.
See git-pull(1) for details.
git pull <remote> <branch>
If you wish to set tracking information for this branch you can do so with:
git branch --set-upstream-to=origin/<branch> prod
C:\Users\dell company\Documents\It Glance\Internship\POS2\pointonsale>git pull origin prod
From https://gitlab.com/nischalshakya95/pointonsale
* branch prod -> FETCH_HEAD
Updating 22f3b2c..a0f3c61
Fast-forward
src/main/java/org/itglance/pointonsale/domain/Items.java | 2 +-
.../data/changelog/constrain/db.changelog-itemsConst.xml | 4 ++--
...nst.xml => db.changelog-manufacturers_itemsConst.xml} | 10 +++++-----
src/main/resources/data/changelog/csv/branches.csv | 1 +
.../data/changelog/csv/branches_transactions.csv | 1 +
src/main/resources/data/changelog/csv/categories.csv | 2 ++
src/main/resources/data/changelog/csv/employee_logs.csv | 0
src/main/resources/data/changelog/csv/expenses.csv | 1 +
src/main/resources/data/changelog/csv/item_rate.csv | 2 ++
src/main/resources/data/changelog/csv/item_return.csv | 2 ++
src/main/resources/data/changelog/csv/items.csv | 2 ++
src/main/resources/data/changelog/csv/login.csv | 2 ++
src/main/resources/data/changelog/csv/login_role.csv | 0
src/main/resources/data/changelog/csv/manufacturers.csv | 2 ++
.../resources/data/changelog/csv/manufacturers_items.csv | 2 ++
src/main/resources/data/changelog/csv/payments.csv | 2 ++
src/main/resources/data/changelog/csv/role.csv | 2 ++
src/main/resources/data/changelog/csv/sales.csv | 2 ++
src/main/resources/data/changelog/csv/transactions.csv | 2 ++
src/main/resources/data/changelog/csv/users.csv | 3 +++
src/main/resources/data/changelog/csv/users_sales.csv | 0
src/main/resources/data/changelog/db.changelog-items.xml | 2 +-
...g-manufactures.xml => db.changelog-manufacturers.xml} | 2 +-
...es_items.xml => db.changelog-manufacturers_items.xml} | 4 ++--
.../resources/data/changelog/db.changelog-master.xml | 13 ++++++++++---
src/main/resources/data/changelog/db.changelog-users.xml | 2 +-
.../data/changelog/loader/db.changelog-loginValue.xml | 16 ++++++++++++++++
.../changelog/loader/db.changelog-login_roleValue.xml | 16 ++++++++++++++++
.../data/changelog/loader/db.changelog-roleValue.xml | 16 ++++++++++++++++
.../data/changelog/loader/db.changelog-usersValue.xml | 16 ++++++++++++++++
30 files changed, 115 insertions(+), 16 deletions(-)
rename src/main/resources/data/changelog/constrain/{db.changelog-manufactures_itemsConst.xml => db.changelog-manufacturers_itemsConst.xml} (65%)
create mode 100644 src/main/resources/data/changelog/csv/branches.csv
create mode 100644 src/main/resources/data/changelog/csv/branches_transactions.csv
create mode 100644 src/main/resources/data/changelog/csv/categories.csv
create mode 100644 src/main/resources/data/changelog/csv/employee_logs.csv
create mode 100644 src/main/resources/data/changelog/csv/expenses.csv
create mode 100644 src/main/resources/data/changelog/csv/item_rate.csv
create mode 100644 src/main/resources/data/changelog/csv/item_return.csv
create mode 100644 src/main/resources/data/changelog/csv/items.csv
create mode 100644 src/main/resources/data/changelog/csv/login.csv
create mode 100644 src/main/resources/data/changelog/csv/login_role.csv
create mode 100644 src/main/resources/data/changelog/csv/manufacturers.csv
create mode 100644 src/main/resources/data/changelog/csv/manufacturers_items.csv
create mode 100644 src/main/resources/data/changelog/csv/payments.csv
create mode 100644 src/main/resources/data/changelog/csv/role.csv
create mode 100644 src/main/resources/data/changelog/csv/sales.csv
create mode 100644 src/main/resources/data/changelog/csv/transactions.csv
create mode 100644 src/main/resources/data/changelog/csv/users.csv
create mode 100644 src/main/resources/data/changelog/csv/users_sales.csv
rename src/main/resources/data/changelog/{db.changelog-manufactures.xml => db.changelog-manufacturers.xml} (92%)
rename src/main/resources/data/changelog/{db.changelog-manufactures_items.xml => db.changelog-manufacturers_items.xml} (83%)
create mode 100644 src/main/resources/data/changelog/loader/db.changelog-loginValue.xml
create mode 100644 src/main/resources/data/changelog/loader/db.changelog-login_roleValue.xml
create mode 100644 src/main/resources/data/changelog/loader/db.changelog-roleValue.xml
create mode 100644 src/main/resources/data/changelog/loader/db.changelog-usersValue.xml
C:\Users\dell company\Documents\It Glance\Internship\POS2\pointonsale>git pull origin prod
remote: Counting objects: 9, done.
remote: Compressing objects: 100% (6/6), done.
remote: Total 9 (delta 2), reused 7 (delta 0)
Unpacking objects: 100% (9/9), done.
From https://gitlab.com/nischalshakya95/pointonsale
* branch prod -> FETCH_HEAD
a0f3c61..b8ed81a prod -> origin/prod
Updating a0f3c61..b8ed81a
Fast-forward
pom.xml | 14 ++++++++
.../itglance/pointonsale/config/SwaggerConfig.java | 41 ++++++++++++++++++++++
.../constant/ConstantConfiguration.java | 10 ++++++
.../itglance/pointonsale/web/rest/ExpenseApi.java | 19 ++++++++--
.../pointonsale/web/rest/InventoryApi.java | 35 ++++++++++++++++--
.../org/itglance/pointonsale/web/rest/SaleApi.java | 19 ++++++++--
.../pointonsale/web/rest/TransactionApi.java | 17 ++++++++-
.../org/itglance/pointonsale/web/rest/UserApi.java | 39 ++++++++++++++------
src/main/resources/application.yml | 1 -
9 files changed, 176 insertions(+), 19 deletions(-)
create mode 100644 src/main/java/org/itglance/pointonsale/config/SwaggerConfig.java
create mode 100644 src/main/java/org/itglance/pointonsale/constant/ConstantConfiguration.java
C:\Users\dell company\Documents\It Glance\Internship\POS2\pointonsale>
Comments
Post a Comment