Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
First Contributions
first-contributions
Repository
60b0e8507fa71bfa45222cb81116fea368ca1130
Switch branch/tag
first-contributions
additional-material
git_workflow_scenarios
resolving-merge-conflicts.md
Find file
Blame
History
Permalink
Resolving conflicts
· 60b0e850
Amit Jindal
authored
Oct 18, 2018
60b0e850
