odd github behavior

odd github behavior

Postby metulburr » Sat Apr 12, 2014 9:55 am

I am not sure what happened with guthub here. the repo
https://github.com/metulburr/Boom

I uploaded code and it uploaded its changes embedded into the actual code such as:
Code: Select all
+<<<<<<< HEAD

             if event.key in self.keybinding['left']:

                 self.switch_card(-1)

             elif event.key in self.keybinding['right']:

@@ -60,6 +65,19 @@ def get_event(self, event, keys):

                 self.change_selected_option(1)

                 

             elif event.key == self.keybinding['select']:

+=======

+            if event.key in [pg.K_LEFT, pg.K_a]:

+                self.switch_card(-1)

+            elif event.key in [pg.K_RIGHT, pg.K_d]:

+                self.switch_card(1)

+           

+            elif event.key in [pg.K_UP, pg.K_w]:

+                self.change_selected_option(-1)

+            elif event.key in [pg.K_DOWN, pg.K_s]:

+                self.change_selected_option(1)

+               

+            elif event.key == pg.K_RETURN:

+>>>>>>> a323e52aa62ab9eee8dcaac6689062f56ecb15e2

so now if someone was to download the repo, and start it you would get:
Code: Select all
metulburr@arch ~/Downloads/Boom-c2bc3ec0e9d114562c328a0250c9952309f0b507 $ python3 game.py
Traceback (most recent call last):
  File "game.py", line 4, in <module>
    from data.main import main
  File "/home/metulburr/Downloads/Boom-c2bc3ec0e9d114562c328a0250c9952309f0b507/data/main.py", line 3, in <module>
    from .control import Control
  File "/home/metulburr/Downloads/Boom-c2bc3ec0e9d114562c328a0250c9952309f0b507/data/control.py", line 4, in <module>
    from .states import menu, splash, viewer, testing
  File "/home/metulburr/Downloads/Boom-c2bc3ec0e9d114562c328a0250c9952309f0b507/data/states/menu.py", line 4, in <module>
    from .. import tools
  File "/home/metulburr/Downloads/Boom-c2bc3ec0e9d114562c328a0250c9952309f0b507/data/tools.py", line 97
    <<<<<<< HEAD
     ^
SyntaxError: invalid syntax
metulburr@arch ~/Downloads/Boom-c2bc3ec0e9d114562c328a0250c9952309f0b507  $




My local content however does not contain that HEAD etc. The game runs fine there. pull says its up to date, and push also.
Code: Select all
metulburr@arch ~/repos/boom $ git status
On branch master
nothing to commit, working directory clean

Code: Select all
metulburr@arch ~/repos/boom $ git pull https://github.com/metulburr/Boom.git
From https://github.com/metulburr/Boom
 * branch            HEAD       -> FETCH_HEAD
Already up-to-date.

Code: Select all
metulburr@arch ~/repos/boom  $ git push origin master
error: cannot run /usr/lib/seahorse/seahorse-ssh-askpass: No such file or directory
Username for 'https://github.com': metulburr
error: cannot run /usr/lib/seahorse/seahorse-ssh-askpass: No such file or directory
Password for 'https://metulburr@github.com':
Everything up-to-date

Code: Select all
metulburr@arch ~/repos/boom $ python3 game.py
difficulty: medium
window size: [800, 600]
metulburr@arch ~/repos/boom $

Aside from deleting the repo and starting anew, what can you do to update the repo to the true local content?
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: odd github behavior

Postby metulburr » Sat Apr 12, 2014 11:52 am

i guess i figured out a work around. Although i lost the commit history.

Code: Select all
git reset --hard 896cec8f9fc27cc040ea338f664c8bc82a436a0b
git push -f origin master
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 2 guests