Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
courses
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
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
R3
school
courses
Commits
b282aff4
Commit
b282aff4
authored
2 years ago
by
Vilem Ded
Browse files
Options
Downloads
Patches
Plain Diff
pull request is not used as the pull command is not introduced
parent
1a3d035e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!129
[release] Regular merge of develop
,
!121
git part 1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
2022/2022-05-31_git-triology-part-1/slides/best_practices.md
+1
-1
1 addition, 1 deletion
2022/2022-05-31_git-triology-part-1/slides/best_practices.md
2022/2022-05-31_git-triology-part-1/slides/merge.md
+3
-2
3 additions, 2 deletions
2022/2022-05-31_git-triology-part-1/slides/merge.md
with
4 additions
and
3 deletions
2022/2022-05-31_git-triology-part-1/slides/best_practices.md
+
1
−
1
View file @
b282aff4
...
...
@@ -38,7 +38,7 @@
## Best practices
*
Work on your
<font
color=
"red"
>
own
</font>
branch (in your own fork), and
**not**
on
`master`
and
**not**
on
`develop`
*
Do
**not commit**
to
`master`
/
`develop`
, but
**submit a merge
R
equest (
P
R)**
*
Do
**not commit**
to
`master`
/
`develop`
, but
**submit a merge
r
equest (
M
R)**
*
Get your code
**reviewed**
by your peers (submit a merge request!)
*
Submit a merge request
**often**
! (as soon as the feature is ready)
*
Make commits often (keeps increments small)
...
...
This diff is collapsed.
Click to expand it.
2022/2022-05-31_git-triology-part-1/slides/merge.md
+
3
−
2
View file @
b282aff4
...
...
@@ -12,9 +12,10 @@ You have to <font color="color:red">merge</font> the branches.
**Remarks**
: merging is directional -
*Merge branch A to branch B*
### The merge is initiated via so called **merge request**
*Requesting*
someone (from the original repository) to
*merge*
your changes.
*
*Requesting*
someone (from the original repository) to
*merge*
your changes.
*
*merge request*
is commonly abreviated as
**MR**
Your peers can comment on your changes in a
**review**
!
Your peers can comment on your changes in a
merge request
**review**
!
...
...
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