Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
2
2017-F2-Forge
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Youssef NIDABRAHIM
2017-F2-Forge
Commits
4a165c0b
Commit
4a165c0b
authored
7 years ago
by
NIDABRAHIM Youssef
Browse files
Options
Downloads
Patches
Plain Diff
Q3.1.2
parent
f258f210
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
REDA_YOUSSEF.md
+15
-6
15 additions, 6 deletions
REDA_YOUSSEF.md
easy_merge
+1
-0
1 addition, 0 deletions
easy_merge
with
16 additions
and
6 deletions
REDA_YOUSSEF.md
+
15
−
6
View file @
4a165c0b
...
@@ -497,16 +497,25 @@ $ git commit -m "Q2.11"
...
@@ -497,16 +497,25 @@ $ git commit -m "Q2.11"
0. Merge depuis head
0. Merge depuis head
0. switcher sur une nouvelle branche `mybranch-3.1`
0. switcher sur une nouvelle branche `mybranch-3.1`
```
```
git brach -b reda_youssef_3
$ git checkout -b reda_youssef-3.1
Switched to a new branch 'reda_youssef-3.1'
```
```
0. ajout un nouveau fichier nommé easy_merge avec la date et l'heure actuelle `*`
0. ajout un nouveau fichier nommé easy_merge avec la date et l'heure actuelle `*`
```
```
touch easy_merge
$
touch easy_merge
date > easy_merge
$
date > easy_merge
git add .
```
git
commit
-m "
Q3.1.2
"
> On
commit
e cette étape
Q3.1.2
```
```
0. merger la branche `mybranch-4.1` sur `mybranch`
$ git add .
$ git commit -m "Q3.1.2"
[reda_youssef-3.1 3288cda] Q3.1.2
2 files changed, 9 insertions(+), 3 deletions(-)
create mode 100644 easy_merge
```
0. merger la branche `mybranch-3.1` sur `mybranch`
```
```
git checkout reda_youssef
git checkout reda_youssef
git merge reda_youssef_3
git merge reda_youssef_3
...
...
This diff is collapsed.
Click to expand it.
easy_merge
0 → 100644
+
1
−
0
View file @
4a165c0b
lun. 12 févr. 2018 23:34:01
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment