This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
~/Code/watched.it-client/build (master) $ git pull origin refactor | |
remote: Counting objects: 30, done. | |
remote: Compressing objects: 100% (17/17), done. | |
remote: Total 22 (delta 5), reused 22 (delta 5) | |
Unpacking objects: 100% (22/22), done. | |
From github.com:leehambley/watched.it-client | |
* branch refactor -> FETCH_HEAD | |
CONFLICT (delete/modify): src/mac/nowlistening.m deleted in 1068f6a93b1896321bfc6118072a4e0c97facf56 and modified in HEAD. Version HEAD of src/mac/nowlistening.m left in tree. | |
Removing src/nowlistening.h | |
Removing src/shared/record_struct.cpp | |
Automatic merge failed; fix conflicts and then commit the result. | |
~/Code/watched.it-client/build (master) $ git checkout refactor | |
error: pathspec 'build/refactor' did not match any file(s) known to git. | |
~/Code/watched.it-client/build (master) $ git branch | |
help | |
* master | |
~/Code/watched.it-client/build (master) $ git undo | |
git: 'undo' is not a git-command. See 'git --help'. | |
Did you mean this? | |
bundle | |
~/Code/watched.it-client/build (master) $ git rebase | |
A rebase is in progress, try --continue, --skip or --abort. | |
~/Code/watched.it-client/build (master) $ git rebase --continue | |
You must edit all merge conflicts and then | |
mark them as resolved using git add | |
~/Code/watched.it-client/build (master) $ git rebase --abort | |
HEAD is now at 992b178 Merge branch 'master' of github.com:leehambley/watched.it-client | |
~/Code/watched.it-client/build (master) $ git commit -a | |
# On branch master | |
nothing to commit (working directory clean) | |
~/Code/watched.it-client/build (master) $ git checkout refactor | |
error: pathspec 'build/refactor' did not match any file(s) known to git. | |
~/Code/watched.it-client/build (master) $ git branch | |
help | |
* master | |
~/Code/watched.it-client/build (master) $ git pull origin refactor | |
From github.com:leehambley/watched.it-client | |
* branch refactor -> FETCH_HEAD | |
CONFLICT (delete/modify): src/mac/nowlistening.m deleted in 1068f6a93b1896321bfc6118072a4e0c97facf56 and modified in HEAD. Version HEAD of src/mac/nowlistening.m left in tree. | |
Removing src/nowlistening.h | |
Removing src/shared/record_struct.cpp | |
Automatic merge failed; fix conflicts and then commit the result. | |
~/Code/watched.it-client/build (master) $ git rebase --abort | |
No rebase in progress? | |
~/Code/watched.it-client/build (master) $ git rebase | |
Usage: git rebase [--interactive | -i] [-v] [--force-rebase | -f] [--onto <newbase>] [<upstream>|--root] [<branch>] [--quiet | -q] | |
~/Code/watched.it-client/build (master) $ git branch refactor | |
~/Code/watched.it-client/build (master) $ git checkout refactor | |
src/mac/nowlistening.m: needs merge | |
error: you need to resolve your current index first | |
~/Code/watched.it-client/build (master) $ git rebase | |
Usage: git rebase [--interactive | -i] [-v] [--force-rebase | -f] [--onto <newbase>] [<upstream>|--root] [<branch>] [--quiet | -q] | |
~/Code/watched.it-client/build (master) $ git pull origin master | |
You are in the middle of a conflicted merge. | |
~/Code/watched.it-client/build (master) $ git merge | |
fatal: You have not concluded your merge. (MERGE_HEAD exists) | |
~/Code/watched.it-client/build (master) $ git undo | |
git: 'undo' is not a git-command. See 'git --help'. | |
Did you mean this? | |
bundle | |
~/Code/watched.it-client/build (master) $ git checkout master | |
src/mac/nowlistening.m: needs merge | |
error: you need to resolve your current index first | |
~/Code/watched.it-client/build (master) $ git commit -a | |
[master db4d80a] Merge branch 'refactor' of github.com:leehambley/watched.it-client | |
~/Code/watched.it-client/build (master) $ git checkout refactor | |
Switched to branch 'refactor' | |
~/Code/watched.it-client/build (refactor) $ mate .. | |
~/Code/watched.it-client/build (refactor) $ git pull origin refactor | |
From github.com:leehambley/watched.it-client | |
* branch refactor -> FETCH_HEAD | |
CONFLICT (delete/modify): src/mac/nowlistening.m deleted in 1068f6a93b1896321bfc6118072a4e0c97facf56 and modified in HEAD. Version HEAD of src/mac/nowlistening.m left in tree. | |
Removing src/nowlistening.h | |
Removing src/shared/record_struct.cpp | |
Automatic merge failed; fix conflicts and then commit the result. | |
~/Code/watched.it-client/build (refactor) $ rm ../src/mac/nowlistening.m | |
~/Code/watched.it-client/build (refactor) $ git pull origin refactor | |
You are in the middle of a conflicted merge. | |
~/Code/watched.it-client/build (refactor) $ git rebase | |
Usage: git rebase [--interactive | -i] [-v] [--force-rebase | -f] [--onto <newbase>] [<upstream>|--root] [<branch>] [--quiet | -q] | |
~/Code/watched.it-client/build (refactor) $ git pull --rebase | |
You are in the middle of a conflicted merge. | |
~/Code/watched.it-client/build (refactor) $ git checkout | |
src/mac/nowlistening.m: needs merge | |
error: you need to resolve your current index first | |
~/Code/watched.it-client/build (refactor) $ git checkout refactor | |
src/mac/nowlistening.m: needs merge | |
error: you need to resolve your current index first | |
~/Code/watched.it-client/build (refactor) $ git merge | |
fatal: You have not concluded your merge. (MERGE_HEAD exists) | |
~/Code/watched.it-client/build (refactor) $ rm ../ | |
.git/ .gitignore .gitmodules CMakeLists.txt README.md build/ src/ | |
~/Code/watched.it-client/build (refactor) $ rm ../src/ma | |
mac/ main.cpp | |
~/Code/watched.it-client/build (refactor) $ rm ../src/mac/ | |
current_track.mm iTunes.h nowlistening.h nowlistening.mm polling_probe.mm | |
~/Code/watched.it-client/build (refactor) $ rm ../src/mac/ | |
current_track.mm iTunes.h nowlistening.h nowlistening.mm polling_probe.mm | |
~/Code/watched.it-client/build (refactor) $ cd .. | |
~/Code/watched.it-client (refactor) $ cd .. | |
~/Code $ rm -rf watched.it-client/ | |
~/Code $ mkdir watched.it-client | |
~/Code $ cd watched.it-client/ | |
~/Code/watched.it-client $ git clone git@github.com:leehambley/watched.it-client.git . | |
Initialized empty Git repository in /Users/seanhandley/Code/watched.it-client/.git/ | |
remote: Counting objects: 137, done. | |
remote: Compressing objects: 100% (75/75), done. | |
remote: Total 137 (delta 61), reused 122 (delta 54) | |
Receiving objects: 100% (137/137), 22.49 KiB, done. | |
Resolving deltas: 100% (61/61), done. | |
~/Code/watched.it-client (master) $ git checkout refactor | |
error: pathspec 'refactor' did not match any file(s) known to git. | |
~/Code/watched.it-client (master) $ git branch | |
* master | |
~/Code/watched.it-client (master) $ git pull origin refactor | |
From github.com:leehambley/watched.it-client | |
* branch refactor -> FETCH_HEAD | |
CONFLICT (delete/modify): src/mac/nowlistening.m deleted in 1068f6a93b1896321bfc6118072a4e0c97facf56 and modified in HEAD. Version HEAD of src/mac/nowlistening.m left in tree. | |
Removing src/nowlistening.h | |
Removing src/shared/record_struct.cpp | |
Automatic merge failed; fix conflicts and then commit the result. | |
~/Code/watched.it-client (master) $ git rebase | |
Usage: git rebase [--interactive | -i] [-v] [--force-rebase | -f] [--onto <newbase>] [<upstream>|--root] [<branch>] [--quiet | -q] | |
~/Code/watched.it-client (master) $ git checkout refactor | |
error: pathspec 'refactor' did not match any file(s) known to git. | |
~/Code/watched.it-client (master) $ git pull origin refactor --rebase | |
You are in the middle of a conflicted merge. | |
~/Code/watched.it-client (master) $ git rebase --abort | |
No rebase in progress? | |
~/Code/watched.it-client (master) $ cd .. | |
~/Code $ rm -rf watched.it-client/ | |
~/Code $ mkdir watched.it-client | |
~/Code $ cd watched.it-client/ | |
~/Code/watched.it-client $ git clone git@github.com:leehambley/watched.it-client.git . refactor | |
Too many arguments. | |
usage: git clone [options] [--] <repo> [<dir>] | |
-q, --quiet be quiet | |
-v, --verbose be verbose | |
-n, --no-checkout don't create a checkout | |
--bare create a bare repository | |
--mirror create a mirror repository (implies bare) | |
-l, --local to clone from a local repository | |
--no-hardlinks don't use local hardlinks, always copy | |
-s, --shared setup as shared repository | |
--recursive initialize submodules in the clone | |
--template <path> path the template repository | |
--reference <repo> reference repository | |
-o, --origin <branch> | |
use <branch> instead of 'origin' to track upstream | |
-b, --branch <branch> | |
checkout <branch> instead of the remote's HEAD | |
-u, --upload-pack <path> | |
path to git-upload-pack on the remote | |
--depth <depth> create a shallow clone of that depth | |
~/Code/watched.it-client $ git clone git@github.com:leehambley/watched.it-client.git . -o refactor | |
Initialized empty Git repository in /Users/seanhandley/Code/watched.it-client/.git/ | |
remote: Counting objects: 137, done. | |
remote: Compressing objects: 100% (75/75), done. | |
remote: Total 137 (delta 61), reused 122 (delta 54) | |
Receiving objects: 100% (137/137), 22.49 KiB, done. | |
Resolving deltas: 100% (61/61), done. | |
~/Code/watched.it-client (master) $ git branch | |
* master | |
~/Code/watched.it-client (master) $ git rebase | |
Usage: git rebase [--interactive | -i] [-v] [--force-rebase | -f] [--onto <newbase>] [<upstream>|--root] [<branch>] [--quiet | -q] | |
~/Code/watched.it-client (master) $ git rebase refactor | |
Current branch master is up to date. | |
~/Code/watched.it-client (master) $ git checkout refactor | |
Note: moving to 'refactor' which isn't a local branch | |
If you want to create a new branch from this checkout, you may do so | |
(now or later) by using -b with the checkout command again. Example: | |
git checkout -b <new_branch_name> | |
HEAD is now at 992b178... Merge branch 'master' of github.com:leehambley/watched.it-client | |
~/Code/watched.it-client $ git branch | |
* (no branch) | |
master | |
~/Code/watched.it-client $ git checkout refactor | |
HEAD is now at 992b178... Merge branch 'master' of github.com:leehambley/watched.it-client | |
~/Code/watched.it-client $ git pull origin refactor | |
fatal: 'origin' does not appear to be a git repository | |
fatal: The remote end hung up unexpectedly | |
~/Code/watched.it-client $ cd .. | |
~/Code $ rm -rf watched.it-client/ | |
~/Code $ mkdir watched.it-client | |
~/Code $ cd watched.it-client/ | |
~/Code/watched.it-client $ git clone git@github.com:leehambley/watched.it-client.git . | |
Initialized empty Git repository in /Users/seanhandley/Code/watched.it-client/.git/ | |
remote: Counting objects: 137, done. | |
remote: Compressing objects: 100% (75/75), done. | |
remote: Total 137 (delta 61), reused 122 (delta 54) | |
Receiving objects: 100% (137/137), 22.49 KiB, done. | |
Resolving deltas: 100% (61/61), done. | |
~/Code/watched.it-client (master) $ git checkout -b refactor | |
Switched to a new branch 'refactor' | |
~/Code/watched.it-client (refactor) $ ls | |
CMakeLists.txt README.md src | |
~/Code/watched.it-client (refactor) $ git branch | |
master | |
* refactor | |
~/Code/watched.it-client (refactor) $ mate . | |
~/Code/watched.it-client (refactor) $ git pull origin refactor | |
From github.com:leehambley/watched.it-client | |
* branch refactor -> FETCH_HEAD | |
CONFLICT (delete/modify): src/mac/nowlistening.m deleted in 1068f6a93b1896321bfc6118072a4e0c97facf56 and modified in HEAD. Version HEAD of src/mac/nowlistening.m left in tree. | |
Removing src/nowlistening.h | |
Removing src/shared/record_struct.cpp | |
Automatic merge failed; fix conflicts and then commit the result. | |
~/Code/watched.it-client (refactor) $ git rebase --abort | |
No rebase in progress? | |
~/Code/watched.it-client (refactor) $ git rebase refactor | |
cannot rebase: you have unstaged changes | |
U src/mac/nowlistening.m | |
M src/mac/nowlistening.m | |
~/Code/watched.it-client (refactor) $ git commit -a | |
[refactor cd62186] Merge branch 'refactor' of github.com:leehambley/watched.it-client into refactor | |
~/Code/watched.it-client (refactor) $ git rebase refactor | |
Current branch refactor is up to date. | |
~/Code/watched.it-client (refactor) $ git pull origin refactor | |
From github.com:leehambley/watched.it-client | |
* branch refactor -> FETCH_HEAD | |
Already up-to-date. | |
~/Code/watched.it-client (refactor) $ git pull origin refactor | |
From github.com:leehambley/watched.it-client | |
* branch refactor -> FETCH_HEAD | |
Already up-to-date. | |
~/Code/watched.it-client (refactor) $ mate . | |
~/Code/watched.it-client (refactor) $ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment