git - How to push changes from one branch to another? -



git - How to push changes from one branch to another? -

i working on local git repository. there 2 branches,master , development. want force development changes master branch, how do that? when do:

git branch -a

i see...

* development master remotes/origin/head -> origin/master remotes/origin/development remotes/origin/master

you want on master branch merge development branch it. if there conflicts fail , tell are.

git checkout master git merge development

i tend on cautious , in local, disposable, repository force upstream after sorted/merged.

git github

Comments