Skip to content

Instantly share code, notes, and snippets.

@terrycojones

terrycojones/gist:1206393

Created September 9, 2011 14:36
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save terrycojones/1206393 to your computer and use it in GitHub Desktop.
Save terrycojones/1206393 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.sh
t61p ~/fluidinfo/src/fluiddb (integrate-oauth-1297) $ git branch
* integrate-oauth-1297
master
t61p ~/fluidinfo/src/fluiddb (integrate-oauth-1297) $ git fetch git@github.com:jkakar/fluiddb.git oauth-echo-token-1289:oauth-echo-token-1289
From github.com:jkakar/fluiddb
* [new branch] oauth-echo-token-1289 -> oauth-echo-token-1289
t61p ~/fluidinfo/src/fluiddb (integrate-oauth-1297) $ git branch
* integrate-oauth-1297
master
oauth-echo-token-1289
t61p ~/fluidinfo/src/fluiddb (integrate-oauth-1297) $ git com
Switched to branch 'master'
t61p ~/fluidinfo/src/fluiddb (master) $ git pull
Already up-to-date.
t61p ~/fluidinfo/src/fluiddb (master) $ git checkout oauth-echo-token-1289
error: Untracked working tree file 'fluiddb/common/types_thrift/__init__.py' would be overwritten by merge.
t61p ~/fluidinfo/src/fluiddb (master) $ rm fluiddb/common/types_thrift/
constants.py __init__.py __init__.pyc ttypes.py ttypes.pyc
t61p ~/fluidinfo/src/fluiddb (master) $ ls -la fluiddb/common/types_thrift/__init__.py
-rw-r--r-- 1 terry terry 34 2011-09-07 22:36 fluiddb/common/types_thrift/__init__.py
t61p ~/fluidinfo/src/fluiddb (master) $ less fluiddb/common/types_thrift/__init__.py
t61p ~/fluidinfo/src/fluiddb (master) $ rm fluiddb/common/types_thrift/__init__.py
t61p ~/fluidinfo/src/fluiddb (master) $ git checkout oauth-echo-token-1289
error: Untracked working tree file 'fluiddb/common/types_thrift/ttypes.py' would be overwritten by merge.
t61p ~/fluidinfo/src/fluiddb (master) $ git pull
Already up-to-date.
t61p ~/fluidinfo/src/fluiddb (master) $ git pull origin
Already up-to-date.
t61p ~/fluidinfo/src/fluiddb (master) $ git st
# On branch master
nothing to commit (working directory clean)
t61p ~/fluidinfo/src/fluiddb (master) $ ls -al fluiddb/common/types_thrift/ttypes.py
ttypes.py ttypes.pyc
t61p ~/fluidinfo/src/fluiddb (master) $ rm fluiddb/common/types_thrift/ttypes.py*
t61p ~/fluidinfo/src/fluiddb (master) $ git st
# On branch master
nothing to commit (working directory clean)
t61p ~/fluidinfo/src/fluiddb (master) $ git checkout oauth-echo-token-1289
Switched to branch 'oauth-echo-token-1289'
t61p ~/fluidinfo/src/fluiddb (oauth-echo-token-1289)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment