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

Post a Comment

Popular posts from this blog

Android layout hidden on keyboard show -

i have strange problem layout. when tap on edittext , keyboard shown edittext stay on bottom , when tap on to hide keyboard , keyboard hides , edittext go should when want input text. when tap again, keyboard shown , edittext goes down behind keyboard... <relativelayout android:layout_width="match_parent" android:layout_height="match_parent" > <scrollview android:layout_width="match_parent" android:layout_height="fill_parent" android:above="@+id/rl_commands"> <textview android:layout_width="match_parent" android:layout_height="wrap_content"/> </scrollview> <relativelayout android:layout_width="match_parent android:layout_height="24dp" android:id="@+id/rl_commands" android:alignparentbottom="true"> ...
Read more

google app engine - 403 Forbidden POST - Flask WTForms -

i have flask application running on google app engine. trying submit form built using wtform , keep getting following error. 403 forbidden: don't have permission access requested resource. either read-protected or not readable server. location.html (part of code) <form method=post action="/home/location"> .... <button type="submit" class="btn btn-primary" value="submit"> directions </button> </form> main.py @app.route('/home/location', methods=['post', 'get']) def location(): form = cfcdirections.direction(request.form) print(request.method) if request.method == 'post' , form.validate(): print("after if") directions = cfcdirections() street_no = directions.no street = directions.street suburb = directions.suburb postcode = directions.postcode ...
Read more

git - Possible to change Gitlab repository creation schema? -

my gitlab repos path set : data/git/repositories if user called superman creates new project gitlab automatically setup git repos path : data/git/repositories/superman/projectname does know can configure ? don't want have owners name in repos path. if want user's name in repository's path, set group project, , work against group's repository/ies. repositories lay in: /path/repositories/projectgroup/projectname thoug, gitlab somehow works github, each user has own personal repositories, can sync development branches , make merge requests group's repositories sets of commits, it's easier track modifications' ownership through forks. have @ tutorial such one how create , use it.
Read more