Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Privacy
Imprint
Contact
Login methods
Sign in
Toggle navigation
Menu
Open sidebar
projects.thm.de
GitLab FOSS
Repository
06a2e3854e383fd8ae042af182c54f5d607f2302
Switch branch/tag
gitlab
app
assets
javascripts
merge_conflicts
merge_conflict_store.js
Find file
Blame
History
Permalink
Make it explicit that merge conflict feature commits to source branch
· 06a2e385
Annabel Dunstone Gray
authored
May 11, 2018
06a2e385