Skip to content

Add feature highlight on conflict resolution

username-removed-443319 requested to merge feature-highlight-resolving-merge-conflicts into master

@marcia this closes https://gitlab.com/gitlab-com/marketing/issues/417. I've just left the date as today, because I don't know when it should be published. Please be brutal, this is my first blog post and it's the only way I'll learn :sligh

/cc @Lindberg

Merge request reports