15
I have these 2 branches on my remote GitHub repository:
- development
- master
How do I merge development into master on the remote repository? I've tried
git merge development
and
git merge origin
but it says the repo is up to date so I'm doing it wrong because github says development is 12 commits ahead of master.
Update
Thanks for the follow ups - here's some more info, I did a push to the remote repository with
git push origin
and my changes have been committed. If I do a clone in another folder I see all the changes there if I checkout the development branch.
git branch -av
development 8265e30 - etc
hotfix-t4 8342e44 - etc
*master 0041bod - Initial Commit
remotes/origin/HEAD -> origin/master
remotes/origin/development 8265e30 - etc
remotes/origin/experimental 22cd3ef test1
remotes/origin/hotfix-t4 8342e44 test
remotes/origin/master 0041bod Initial commit