Welcome to Git (version 1.7.6-preview20110708)


Run 'git help git' to display the help index.
Run 'git help <command>' to display help for specific commands.

Aki@AKI20101105 ~
$ cd "H:/My Git"

Aki@AKI20101105 /h/My Git
$ cd MultiVerse_Aki

Aki@AKI20101105 /h/My Git/MultiVerse_Aki ((fda6b31...)|MERGING)
$ git merge upstream/master
fatal: You have not concluded your merge (MERGE_HEAD exists).
Please, commit your changes before you can merge.

Aki@AKI20101105 /h/My Git/MultiVerse_Aki ((fda6b31...)|MERGING)
$ git merge upstream/master
Removing COPYING
Removing src/com/onarandombox/MultiverseCore/command/BaseCommand.java
Removing src/com/onarandombox/MultiverseCore/command/CommandManager.java
Removing src/com/onarandombox/MultiverseCore/command/QueuedCommand.java
Removing src/com/onarandombox/MultiverseCore/command/commands/ConfirmCommand.jav
a
CONFLICT (delete/modify): src/com/onarandombox/MultiverseCore/command/commands/C
reateCommand.java deleted in upstream/master and modified in HEAD. Version HEAD
of src/com/onarandombox/MultiverseCore/command/commands/CreateCommand.java left
in tree.
Removing src/com/onarandombox/MultiverseCore/command/commands/DeleteCommand.java

CONFLICT (delete/modify): src/com/onarandombox/MultiverseCore/command/commands/H
elpCommand.java deleted in upstream/master and modified in HEAD. Version HEAD of
 src/com/onarandombox/MultiverseCore/command/commands/HelpCommand.java left in t
ree.
CONFLICT (delete/modify): src/com/onarandombox/MultiverseCore/command/commands/M
odifyAddCommand.java deleted in upstream/master and modified in HEAD. Version HE
AD of src/com/onarandombox/MultiverseCore/command/commands/ModifyAddCommand.java
 left in tree.
CONFLICT (delete/modify): src/com/onarandombox/MultiverseCore/command/commands/M
odifyClearCommand.java deleted in upstream/master and modified in HEAD. Version
HEAD of src/com/onarandombox/MultiverseCore/command/commands/ModifyClearCommand.
java left in tree.
CONFLICT (delete/modify): src/com/onarandombox/MultiverseCore/command/commands/M
odifyRemoveCommand.java deleted in upstream/master and modified in HEAD. Version
 HEAD of src/com/onarandombox/MultiverseCore/command/commands/ModifyRemoveComman
d.java left in tree.
CONFLICT (delete/modify): src/com/onarandombox/MultiverseCore/command/commands/M
odifySetCommand.java deleted in upstream/master and modified in HEAD. Version HE
AD of src/com/onarandombox/MultiverseCore/command/commands/ModifySetCommand.java
 left in tree.
Removing src/com/onarandombox/MultiverseCore/command/commands/PurgeCommand.java
Removing src/com/onarandombox/MultiverseCore/command/commands/ReloadCommand.java

Removing src/com/onarandombox/MultiverseCore/command/commands/RemoveCommand.java

Removing src/com/onarandombox/MultiverseCore/command/commands/SetSpawnCommand.ja
va
CONFLICT (delete/modify): src/com/onarandombox/MultiverseCore/command/commands/S
pawnCommand.java deleted in upstream/master and modified in HEAD. Version HEAD o
f src/com/onarandombox/MultiverseCore/command/commands/SpawnCommand.java left in
 tree.
Removing src/com/onarandombox/MultiverseCore/command/commands/UnloadCommand.java

CONFLICT (delete/modify): src/com/onarandombox/MultiverseCore/command/commands/W
hoCommand.java deleted in upstream/master and modified in HEAD. Version HEAD of
src/com/onarandombox/MultiverseCore/command/commands/WhoCommand.java left in tre
e.
Auto-merging src/com/onarandombox/MultiverseCore/commands/CoordCommand.java
Auto-merging src/com/onarandombox/MultiverseCore/commands/EnvironmentCommand.jav
a
CONFLICT (content): Merge conflict in src/com/onarandombox/MultiverseCore/comman
ds/EnvironmentCommand.java
Auto-merging src/com/onarandombox/MultiverseCore/commands/ImportCommand.java
CONFLICT (content): Merge conflict in src/com/onarandombox/MultiverseCore/comman
ds/ImportCommand.java
Auto-merging src/com/onarandombox/MultiverseCore/commands/InfoCommand.java
Auto-merging src/com/onarandombox/MultiverseCore/commands/ListCommand.java
CONFLICT (content): Merge conflict in src/com/onarandombox/MultiverseCore/comman
ds/ListCommand.java
Auto-merging src/com/onarandombox/MultiverseCore/commands/ModifyCommand.java
Auto-merging src/com/onarandombox/MultiverseCore/commands/TeleportCommand.java
Automatic merge failed; fix conflicts and then commit the result.

Aki@AKI20101105 /h/My Git/MultiVerse_Aki ((fda6b31...)|MERGING)
$ git merge upstream/master
Already up-to-date.

Aki@AKI20101105 /h/My Git/MultiVerse_Aki ((935f987...))
$ git merge upstream/master
Already up-to-date.

Aki@AKI20101105 /h/My Git/MultiVerse_Aki ((935f987...))
$ git merge upstream/master
Already up-to-date.

Aki@AKI20101105 /h/My Git/MultiVerse_Aki ((935f987...))
$ git merge upstream/master
Already up-to-date.

Aki@AKI20101105 /h/My Git/MultiVerse_Aki ((935f987...))
$ git merge upstream/master
Already up-to-date.

Aki@AKI20101105 /h/My Git/MultiVerse_Aki ((935f987...))
$ git push origin master
Enter passphrase for key '/c/Documents and Settings/Aki/.ssh/id_rsa':
Everything up-to-date

Aki@AKI20101105 /h/My Git/MultiVerse_Aki (Aki_ModifyCopy)
$ git status
# On branch Aki_ModifyCopy
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#       modified:   src/com/onarandombox/MultiverseCore/MVWorld.java
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       src/com/onarandombox/MultiverseCore/commands/ModifyCopyCommand.java
no changes added to commit (use "git add" and/or "git commit -a")

Aki@AKI20101105 /h/My Git/MultiVerse_Aki (Aki_ModifyCopy)
$ git log
commit 2a7504c044162f50e82a135b54e1c202a1318d43
Author: Aki Tensai <tensaiaki@gmail.com>
Date:   Sat Jul 16 14:06:45 2011 -0600

    Attempting to get my local to get rid of old files.

commit 6a6d1a2a10fa3b66a261265b1dcbf222df06a1c4
Author: Aki Tensai <tensaiaki@gmail.com>
Date:   Sat Jul 16 13:59:32 2011 -0600

    Altered punctuation on several command's descriptions.  Teleport's descripti

commit 935f987a4d73b5da0962a83498d2db6ecd980082
Merge: fda6b31 c25205f
Author: Aki Tensai <tensaiaki@gmail.com>
Date:   Sat Jul 16 13:28:20 2011 -0600

    Merge remote-tracking branch 'upstream/master' into HEAD

    Conflicts:
        src/com/onarandombox/MultiverseCore/command/commands/CreateCommand.java
        src/com/onarandombox/MultiverseCore/command/commands/HelpCommand.java
        src/com/onarandombox/MultiverseCore/command/commands/ModifyAddCommand.ja
        src/com/onarandombox/MultiverseCore/command/commands/ModifyClearCommand.
        src/com/onarandombox/MultiverseCore/command/commands/ModifyRemoveCommand
        src/com/onarandombox/MultiverseCore/command/commands/ModifySetCommand.ja
        src/com/onarandombox/MultiverseCore/command/commands/SpawnCommand.java
        src/com/onarandombox/MultiverseCore/command/commands/WhoCommand.java
        src/com/onarandombox/MultiverseCore/commands/EnvironmentCommand.java
        src/com/onarandombox/MultiverseCore/commands/ImportCommand.java
        src/com/onarandombox/MultiverseCore/commands/ListCommand.java

commit c25205f61cd62dbb27bd5a3170a55a5965bebeea
Author: Eric Stokes <fernferret@gmail.com>
Date:   Sat Jul 16 12:54:16 2011 -0600

    Really? Really? Why didn't you catch this before... *sigh*

commit 1d87be12e900f4bb87e9b2f66cdb25ac41504478
Author: Eric Stokes <fernferret@gmail.com>
Date:   Sat Jul 16 12:48:58 2011 -0600

    Fixed big oopsie in the Migrator - Thanks go out to MV2 tester Kane_Hart for
    Remove copying file, the licsense should suffice
:
Author: Eric Stokes <fernferret@gmail.com>
Aki@AKI20101105 /h/My Git/MultiVerse_Aki (Aki_ModifyCopy)
:
    Changes to Destination, Added more error checking for ConfigMigrator

commit 1a8c46581c89dc6d1e4490d76b9b5eadcec89e0c
Author: Eric Stokes <fernferret@gmail.com>
Date:   Sat Jul 16 08:43:55 2011 -0600

    Fix concurrent modification. Why would I ever have done that...

commit a87756480a9ca72437d17ea08b63d3175c5a64c8
Author: Eric Stokes <fernferret@gmail.com>
Date:   Sat Jul 16 08:09:56 2011 -0600

    Add another layer of spawn traials, This is needed for generators such as Cl

commit 952a0be4a8e1de554e6e75642038e86e6776dde3
Author: Eric Stokes <fernferret@gmail.com>
Date:   Sat Jul 16 07:41:26 2011 -0600

    Pull changes that fix MVDelete

commit b2f75c52a6821e12316ed14b2bd4eea086f3fedf
Author: Eric Stokes <fernferret@gmail.com>
Date:   Sat Jul 16 06:45:44 2011 -0600

: