Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
TAM
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
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
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
EIP
Labrador
TAM
Merge requests
!193
Prevent Changelog Merge Conflicts
Code
Review changes
Check out branch
Open in Workspace
Download
Patches
Plain diff
Expand sidebar
Merged
Prevent Changelog Merge Conflicts
add-changelog-git-attributes
into
dev
Overview
0
Commits
1
Pipelines
3
Changes
2
Merged
Prevent Changelog Merge Conflicts
Timur Oberhuber
requested to merge
add-changelog-git-attributes
into
dev
Aug 1, 2022
Overview
0
Commits
1
Pipelines
3
Changes
2
Description
Adds merge=union for changelog to prevent merge conflicts
Related Issues
N/A
Checklist
I have added a changelog entry to reflect the significant changes I made.
0
0
Merge request reports
Compare
dev
dev (base)
and
latest version
latest version
525ee9fc
1 commit,
Aug 1, 2022
2 files
+
3
−
0
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
2
.gitattributes
+
2
−
0
View file @ 525ee9fc
Edit in single-file editor
Open in Web IDE
Show full file
* text eol=lf
CHANGELOG.md merge=union
# Denote all files that are truly binary and should not be modified.
*.png binary
*.jpg binary
Loading