Skip to content
GitLab
About GitLab
GitLab: the DevOps platform
Explore GitLab
Install GitLab
How GitLab compares
Get started
GitLab docs
GitLab Learn
Pricing
Talk to an expert
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Projects
Groups
Snippets
Sign up now
Login
Sign in / Register
Toggle navigation
Menu
Open sidebar
AURA
dashboard
Repository
63b0cb2fd44a88e3c1dfb7a972d0a80616e0a72d
Switch branch/tag
dashboard
src
components
EmissionManager.vue
Find file
Blame
History
Permalink
FEAT: implements all conflict resolution modes
· 63b0cb2f
jackie / Andrea Ida Malkah Klaura
authored
Oct 23, 2019
63b0cb2f
jackie / Andrea Ida Malkah Klaura authored63b0cb2f