Skip to content

Instantly share code, notes, and snippets.

@thequbit
Created December 19, 2013 04:00
Show Gist options
  • Save thequbit/8034230 to your computer and use it in GitHub Desktop.
Save thequbit/8034230 to your computer and use it in GitHub Desktop.
(mmenv)administrator@anna:~/dev/monroeminutes/src$ git fetch origin
(mmenv)administrator@anna:~/dev/monroeminutes/src$ git merge origin/revC
Already up-to-date.
(mmenv)administrator@anna:~/dev/monroeminutes/src$ git checkout revA
warning: unable to rmdir src/BarkingOwl: Directory not empty
warning: unable to rmdir src/dler: Directory not empty
warning: unable to rmdir src/unpdfer: Directory not empty
Branch revA set up to track remote branch revA from origin.
Switched to a new branch 'revA'
(mmenv)administrator@anna:~/dev/monroeminutes/src$ git checkout --track origin/revC
fatal: A branch named 'revC' already exists.
(mmenv)administrator@anna:~/dev/monroeminutes/src$ git checkout revC
Switched to branch 'revC'
(mmenv)administrator@anna:~/dev/monroeminutes/src$ git pull
You asked me to pull without telling me which branch you
want to merge with, and 'branch.revC.merge' in
your configuration file does not tell me, either. Please
specify which branch you want to use on the command line and
try again (e.g. 'git pull <repository> <refspec>').
See git-pull(1) for details.
If you often merge with the same branch, you may want to
use something like the following in your configuration file:
[branch "revC"]
remote = <nickname>
merge = <remote-ref>
[remote "<nickname>"]
url = <url>
fetch = <refspec>
See git-config(1) for details.
(mmenv)administrator@anna:~/dev/monroeminutes/src$
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment