summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/21135-resolve-these-conflicts-link-is-too-subtle.yml4
1 files changed, 4 insertions, 0 deletions
diff --git a/changelogs/unreleased/21135-resolve-these-conflicts-link-is-too-subtle.yml b/changelogs/unreleased/21135-resolve-these-conflicts-link-is-too-subtle.yml
new file mode 100644
index 00000000000..574c322803c
--- /dev/null
+++ b/changelogs/unreleased/21135-resolve-these-conflicts-link-is-too-subtle.yml
@@ -0,0 +1,4 @@
+---
+title: Improve visibility of "Resolve conflicts" and "Merge locally" actions
+merge_request: 8229
+author: