Everytime when I am merging dev branch with my local branch I get the following error:
subl -n -w: subl: command not found
error: There was a problem with the editor 'subl -n -w'.
Not committing merge; use 'git commit' to complete the merge
Your git editor has not configured properly.You have to give full path while configuring your git editor.
For Sublime text 3 use following command-
git config --global core.editor " 'C:/Program Files/Sublime Text 3/subl' -n -w"
If you have Sublime text 2 use following command-
git config --global core.editor " 'C:/program files/sublime text2/sublime_text.exe' -n -w"