Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Z
ZsoGitPractise
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
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
Mykhailo Chaban
ZsoGitPractise
Merge requests
!3
feat: file is updated for future merge conflicts
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
feat: file is updated for future merge conflicts
feat/update-file-to-create-conflicts
into
main
Overview
0
Commits
1
Pipelines
0
Changes
1
Merged
Mykhailo Chaban
requested to merge
feat/update-file-to-create-conflicts
into
main
5 months ago
Overview
0
Commits
1
Pipelines
0
Changes
1
Expand
A file is updated for the future merge conflicts
0
0
Merge request reports
Compare
main
main (base)
and
latest version
latest version
14aa8679
1 commit,
5 months ago
1 file
+
1
−
1
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
practice_file.txt
+
1
−
1
Options
The file
has to be updated with no conflicts
.
The file
is updated to create conflicts in the future
.
\ No newline at end of file
Loading