Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Ohmyzsh
Repository
7cdb6d667c12ff4944d7e68eb519cc5bd6735bc3
Switch branch/tag
ohmyzsh
lib
git.zsh
Find file
Blame
History
Permalink
Resolving conflict when merging in 1570
· 7cdb6d66
Robby Russell
authored
Apr 23, 2013
7cdb6d66
git.zsh
5 KB
Edit
Web IDE
Replace git.zsh
×
Attach a file by drag & drop or
click to upload
Commit message
Replace git.zsh
Replace file
Cancel
GitLab will create a branch in your fork and start a merge request.