Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Git for Beginners
Manage
Activity
Members
Labels
Plan
Issues
1
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
abims
training
Git for Beginners
Merge requests
!9
Sync master with latest from branching basics.
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Sync master with latest from branching basics.
branching-basics
into
main
Overview
0
Commits
5
Pipelines
0
Changes
12
Merged
Mark HOEBEKE
requested to merge
branching-basics
into
main
2 years ago
Overview
0
Commits
5
Pipelines
0
Changes
12
Expand
👍
0
👎
0
Merge request reports
Compare
main
main (base)
and
latest version
latest version
395b501c
5 commits,
2 years ago
12 files
+
124
−
0
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
12
Search (e.g. *.vue) (Ctrl+P)
04-branching-basics/media/conflict-block.png
0 → 100644
+
0
−
0
Options
41.32 KiB
Loading
