Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Comwork public resources
training
git
Commits
32493c7c
Commit
32493c7c
authored
Aug 21, 2021
by
Idriss Neumann
Committed by
Idriss Neumann
Aug 21, 2021
Browse files
Update git.md
parent
83683e74
Changes
1
Hide whitespace changes
Inline
Side-by-side
git.md
View file @
32493c7c
...
...
@@ -207,7 +207,7 @@ Voici le scénario de la démo Git :
###########################
# User 1
mkdir
poc-git
;
cd
poc-git
;
git init
;
touch
README
;
touch
BRANCH
;
git add README BRANCH
;
git commit
-m
'first commit'
;
git remote add origin
ssh
://git
@ci.docapost.io:8006/pcombescot/poc-git.
git
;
git push
-u
origin master
mkdir
poc-git
;
cd
poc-git
;
git init
;
touch
README
;
touch
BRANCH
;
git add README BRANCH
;
git commit
-m
'first commit'
;
git remote add origin
https
://git
lab.comwork.io/comwork_training/
git
;
git push
-u
origin master
####################
...
...
@@ -215,13 +215,13 @@ mkdir poc-git; cd poc-git; git init; touch README; touch BRANCH; git add README
####################
# User 2
git clone
ssh
://git
@ci.docapost.io:8006/pcombescot/poc-git.
git poc-git-2
;
cd
poc-git-2
;
git checkout
-b
0000
;
echo
"modif branch"
>>
BRANCH
;
git add BRANCH
;
git commit
-m
"modif branch"
;
git push origin 0000
git clone
https
://git
lab.comwork.io/comwork_training/
git poc-git-2
;
cd
poc-git-2
;
git checkout
-b
0000
;
echo
"modif branch"
>>
BRANCH
;
git add BRANCH
;
git commit
-m
"modif branch"
;
git push origin 0000
# User 1
echo
"modif master"
>>
README
;
git add README
;
git commit
-m
"modif master"
;
git push origin master
;
echo
"modif bis"
>>
README
;
git add README
;
git commit
-m
"modif bis"
;
git push origin master
# User 3
git clone
ssh
://git
@ci.docapost.io:8006/pcombescot/poc-git.
git poc-git-3
;
cd
poc-git-3
;
git checkout 0000
;
echo
"modif branch bis"
>>
BRANCH
;
git add BRANCH
;
git commit
-m
"modif branch bis"
git clone
https
://git
lab.comwork.io/comwork_training/
git poc-git-3
;
cd
poc-git-3
;
git checkout 0000
;
echo
"modif branch bis"
>>
BRANCH
;
git add BRANCH
;
git commit
-m
"modif branch bis"
# User 2
git checkout master
;
git pull
--rebase
origin master
;
git checkout 0000
;
git pull
--rebase
origin 0000
;
git merge master
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment