Skip to content

@stevepaulo /gist:22b1e248e8dba7a32288 secret
Created

Embed URL

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
gitc pull output
stevembp:~/Sites/br/breport (uber_module-7566-lineup-video-article) $ gitc pull
Retrieving branch information from gitcycle.
Retrieving repo information from gitcycle.
Adding remote repo 'br/breport'.
Fetching remote 'br'.
Merging remote branch 'uber_module-7566-lineup-video-article' from 'br/breport'.
Adding remote repo 'stevepaulo/breport'.
Fetching remote 'stevepaulo'.
Merging remote branch 'uber_module-7566-lineup-video-article' from 'stevepaulo/breport'.
stevembp:~/Sites/br/breport (uber_module-7566-lineup-video-article) $ git fetch br
stevembp:~/Sites/br/breport (uber_module-7566-lineup-video-article) $ git merge br/rc
error: Your local changes to the following files would be overwritten by merge:
public/stylesheets/redesign/common/modules.css
Please, commit your changes or stash them before you can merge.
Aborting
stevembp:~/Sites/br/breport (uber_module-7566-lineup-video-article) $ git st
# On branch uber_module-7566-lineup-video-article
# Changed but not updated:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
# modified: public/stylesheets/redesign/common/modules.css
#
no changes added to commit (use "git add" and/or "git commit -a")
stevembp:~/Sites/br/breport (uber_module-7566-lineup-video-article) $
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.