how to update repo of local branch merge

how to update repo of local branch merge

Postby metulburr » Sat Jan 23, 2016 7:25 pm

I had a branch on git, push the changes to my repo, then merged the branch and master. Now my local shows the merge, but how do I sync the repo with the merge?

Code: Select all
metulburr@ubuntu ~/repos/puzzle $ git checkout master
Switched to branch 'master'
metulburr@ubuntu ~/repos/puzzle $ git merge resizeable_surface
Updating 1b7e816..e4e64b1
Fast-forward
 data/components/button.py        | 17 +++++++++++------
 data/control.py                  | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
 data/prepare.py                  |  9 ++++++---
 data/states/game.py              | 19 ++++++++++---------
 data/states/menu_states/audio.py | 65 ++++++++++++++++++++++++++++++++++++++++++-----------------------
 data/states/menu_states/menus.py | 33 +++++++++++++++++++--------------
 data/states/splash.py            |  8 ++++----
 data/states/state.py             |  6 +++++-
 data/toolbox/button.py           | 35 +++++++++++++++++------------------
 data/tools.py                    | 30 ++++++++++++++++++++++++++++++
 10 files changed, 197 insertions(+), 81 deletions(-)
metulburr@ubuntu ~/repos/puzzle $ git status
On branch master
nothing to commit, working directory clean
metulburr@ubuntu ~/repos/puzzle $ git branch
* master
  resizeable_surface
metulburr@ubuntu ~/repos/puzzle $
we will be moving to python-forum.io on October 1 2016
more details here
User avatar
metulburr
 
Posts: 2243
Joined: Thu Feb 07, 2013 4:47 pm
Location: Elmira, NY

Re: how to update repo of local branch merge

Postby metulburr » Sat Jan 23, 2016 7:29 pm

Im not sure if this is the proper way. But i fixed it with just pushing an empty commit.
we will be moving to python-forum.io on October 1 2016
more details here
User avatar
metulburr
 
Posts: 2243
Joined: Thu Feb 07, 2013 4:47 pm
Location: Elmira, NY

Re: how to update repo of local branch merge

Postby pydsigner » Fri Feb 19, 2016 4:17 am

You don't need to add an empty commit, just push after making the merge.
Laptop: Manjaro Linux, 32GB RAM, 512GB SSD, i7-6820HQ
Python: 2.7.12

For God sent not His Son into the world to condemn the world, but that the world through Him might be saved! (John 3:17)
User avatar
pydsigner
 
Posts: 34
Joined: Sat Feb 23, 2013 12:17 am
Location: Midwestern United States

Re: how to update repo of local branch merge

Postby metulburr » Fri Feb 19, 2016 11:45 am

I dont remember to a T, but i could of sworn that it said nothing to push error when i just tried to push just the merge change.
we will be moving to python-forum.io on October 1 2016
more details here
User avatar
metulburr
 
Posts: 2243
Joined: Thu Feb 07, 2013 4:47 pm
Location: Elmira, NY


Return to Bar

Who is online

Users browsing this forum: No registered users and 1 guest

cron