git - How do I merge two branches (not master)? -


i have following branches in github project

master elvis creditcard

elvis furthest along. need elvis code creditcard branch.

from within creditcard, tried "git merge elvis" , "error: 'merge' not possible because have unmerged files."


Comments

Popular posts from this blog

google app engine - 403 Forbidden POST - Flask WTForms -

Android layout hidden on keyboard show -

Parse xml element into list in Python -