git.exe pull -v --progress       "origin" master

From 69.164.195.209:black-mesa/game
* branch            master     -> FETCH_HEAD
= [up to date]      master     -> origin/master
error: Your local changes to the following files would be overwritten by merge:
.gitignore
bin/engine.dll
bms/base.fgd
bms/bin/client.dll
bms/bin/server.dll
bms/maps/background01.bsp
bms/maps/background02.bsp
bms/maps/background03.bsp
bms/maps/background04.bsp
bms/maps/background05.bsp
bms/maps/background06.bsp
bms/maps/background07.bsp
bms/maps/background08.bsp
bms/maps/background09.bsp
bms/maps/background10.bsp
bms/maps/background11.bsp
bms/maps/background12.bsp
bms/maps/background13.bsp
bms/maps/background14.bsp
bms/maps/bm_c0a0a.bsp
bms/maps/bm_c0a0b.bsp
bms/maps/bm_c0a0c.bsp
bms/maps/bm_c1a0a.bsp
bms/maps/bm_c1a0b.bsp
bms/maps/bm_c1a1a.bsp
bms/maps/bm_c1a1b.bsp
bms/maps/bm_c1a1c.bsp
bms/maps/bm_c1a1d.bsp
bms/maps/bm_c1a1e.bsp
bms/maps/bm_c1a2a.bsp
bms/maps/bm_c1a2b.bsp
bms/maps/bm_c1a2c.bsp
bms/maps/bm_c1a3a.bsp
bms/maps/bm_c1a3b.bsp
bms/maps/bm_c1a3c.bsp
bms/maps/bm_c1a4a.bsp
bms/maps/bm_c1a4b.bsp
bms/maps/bm_c1a4c.bsp
bms/maps/bm_c1a4d.bsp
bms/maps/bm_c1a4e.bsp
bms/maps/bm_c2a1a.bsp
bms/maps/bm_c2a1b.bsp
bms/maps/bm_c2a2a.bsp
bms/maps/bm_c2a2b.bsp
bms/maps/bm_c2a2c.bsp
bms/maps/bm_c2a3a.bsp
bms/maps/bm_c2a3b.bsp
bms/maps/bm_c2a3c.bsp
bms/maps/bm_c2a4a.bsp
bms/maps/bm_c2a4b.bsp
bms/maps/bm_c2a4c.bsp
bms/maps/bm_c2a4e.bsp
bms/maps/bm_c2a4f.bsp
bms/maps/bm_c2a4g.bsp
bms/maps/bm_c2a4h.bsp
bms/maps/bm_c2a5a.bsp
bms/maps/bm_c2a5b.bsp
bms/maps/bm_c2a5c.bsp
bms/maps/bm_c2a5d.bsp
bms/maps/bm_c2a5e.bsp
bms/maps/bm_c2a5f.bsp
bms/maps/bm_c2a5g.bsp
bms/maps/bm_c3a1a.bsp
bms/maps/bm_c3a1b.bsp
bms/maps/bm_c3a2a.bsp
bms/maps/bm_c3a2b.bsp
bms/maps/bm_c3a2c.bsp
bms/maps/bm_c3a2d.bsp
bms/maps/bm_c3a2e.bsp
bms/maps/bm_c3a2f.bsp
bms/maps/bm_c3a2g.bsp
bms/maps/bm_c3a2h.bsp
bms/maps/credits.bsp
bms/maps/graphs/background01.ain
bms/maps/graphs/background02.ain
bms/maps/graphs/bm_c0a0b.ain
bms/maps/graphs/bm_c1a0a.ain
bms/maps/graphs/bm_c2a4a.ain
bms/maps/graphs/bm_c2a5d.ain
bms/maps/graphs/bm_c2a5e.ain
bms/materials/models/props_construction/light_floodlight01_off.vmt
bms/materials/models/props_construction/light_floodlight01_on.vmt
bms/materials/models/props_lab/temmicroscope_cabinet2.vtf
bms/materials/models/props_lab/temmicroscope_screens1.vmt
bms/materials/models/props_lab/temmicroscope_screens2.vmt
bms/models/props_foliage/bushlarge.dx80.vtx
bms/models/props_foliage/bushlarge.dx90.vtx
bms/models/props_foliage/bushlarge.mdl
bms/models/props_foliage/bushlarge.sw.vtx
bms/models/props_foliage/bushlarge.vvd
bms/models/props_foliage/bushmed.dx80.vtx
bms/models/props_foliage/bushmed.dx90.vtx
bms/models/props_foliage/bushmed.mdl
bms/models/props_foliage/bushmed.sw.vtx
bms/models/props_foliage/bushmed.vvd
bms/models/props_foliage/bushsm.dx80.vtx
bms/models/props_foliage/bushsm.dx90.vtx
bms/models/props_foliage/bushsm.mdl
bms/models/props_foliage/bushsm.sw.vtx
bms/models/props_foliage/bushsm.vvd
bms/models/props_foliage/canyon1_sb.dx80.vtx
bms/models/props_foliage/canyon1_sb.dx90.vtx
bms/models/props_foliage/canyon1_sb.mdl
bms/models/props_foliage/canyon1_sb.sw.vtx
bms/models/props_foliage/canyon1_sb.vvd
mapsrc/Singleplayer/C0A0-Black_Mesa_Inbound/bm_c0a0b.vmf
mapsrc/Singleplayer/C1A0-Anomalous_Materials/bm_c1a0a.vmf
mapsrc/Singleplayer/C1A0-Anomalous_Materials/bm_c1a0b.vmf
mapsrc/Singleplayer/C1A1-Unforeseen_Consequences/bm_c1a1a.vmf
mapsrc/Singleplayer/C1A1-Unforeseen_Consequences/bm_c1a1b.vmf
mapsrc/Singleplayer/C1A1-Unforeseen_Consequences/bm_c1a1c.vmf
mapsrc/Singleplayer/C1A2-Office_Complex/bm_c1a2a.vmf
mapsrc/Singleplayer/C1A2-Office_Complex/bm_c1a2c.vmf
mapsrc/Singleplayer/C1A3-We've_Got_Hostiles/bm_c1a3a.vmf
mapsrc/Singleplayer/C1A3-We've_Got_Hostiles/bm_c1a3b.vmf
mapsrc/Singleplayer/C1A3-We've_Got_Hostiles/bm_c1a3c.vmf
mapsrc/Singleplayer/C2A1-Power_Up/bm_c2a1a.vmf
mapsrc/Singleplayer/C2A2-On_A_Rail/bm_c2a2b.vmf
mapsrc/Singleplayer/C2A3-Apprehension/bm_c2a3a.vmf
mapsrc/Singleplayer/C2A4-Questionable_Ethics/bm_c2a4e.vmf
mapsrc/Singleplayer/C2A4-Questionable_Ethics/bm_c2a4f.vmf
mapsrc/Singleplayer/backgrounds/backgrUpdating 9bf693e..7dbca1a
ound01
error: The following untracked working tree files would be overwritten by merge:
bms/maps/graphs/test_4wayblend.ain
bms/maps/test_4wayblend.bsp
bms/materials/dev/dev_4way_blending.vmt
bms/materials/models/props_bounce/bounce_waterfall.vmt
bms/materials/models/props_bounce/bounce_waterfall.vtf
bms/materials/models/props_desert/desert_rocks_cluster_01.vmt
bms/materials/models/props_desert/desert_rocks_cluster_01.vtf
bms/materials/models/props_desert/desert_rocks_cluster_01_normal.vtf
bms/materials/models/props_desert/desert_rocks_cluster_02.vmt
bms/materials/models/props_foliage/grass.vmt
bms/materials/models/props_foliage/grass.vtf
bms/materials/models/props_foliage/tuffs.vmt
bms/materials/models/props_foliage/tuffs.vtf
bms/materials/models/props_industrial/powerbox_large_01.vmt
bms/materials/models/props_industrial/powerbox_large_01.vtf
bms/materials/models/props_industrial/powerbox_large_01_clean.vmt
bms/materials/models/props_industrial/powerbox_large_01_clean.vtf
bms/materials/models/props_lab/temmicroscope_screens3.vmt
bms/materials/models/props_lab/temmicroscope_screens3.vtf
bms/models/props_bounce/bounce_waterfall.dx80.vtx
bms/models/props_bounce/bounce_waterfall.dx90.vtx
bms/models/props_bounce/bounce_waterfall.mdl
bms/models/props_bounce/bounce_waterfall.phy
bms/models/props_bounce/bounce_waterfall.sw.vtx
bms/models/props_bounce/bounce_waterfall.vvd
bms/models/props_desert/desert_rocks_cluster_01.dx80.vtx
bms/models/props_desert/desert_rocks_cluster_01.dx90.vtx
bms/models/props_desert/desert_rocks_cluster_01.mdl
bms/models/props_desert/desert_rocks_cluster_01.phy
bms/models/props_desert/desert_rocks_cluster_01.sw.vtx
bms/models/props_desert/desert_rocks_cluster_01.vvd
bms/models/props_desert/desert_rocks_cluster_02.dx80.vtx
bms/models/props_desert/desert_rocks_cluster_02.dx90.vtx
bms/models/props_desert/desert_rocks_cluster_02.mdl
bms/models/props_desert/desert_rocks_cluster_02.phy
bms/models/props_desert/desert_rocks_cluster_02.sw.vtx
bms/models/props_desert/desert_rocks_cluster_02.vvd
bms/models/props_foliage/canyon2_sb.dx80.vtx
bms/models/props_foliage/canyon2_sb.dx90.vtx
bms/models/props_foliage/canyon2_sb.mdl
bms/models/props_foliage/canyon2_sb.sw.vtx
bms/models/props_foliage/canyon2_sb.vvd
bms/models/props_industrial/powerbox_large_01.dx80.vtx
bms/models/props_industrial/powerbox_large_01.dx90.vtx
bms/models/props_industrial/powerbox_large_01.mdl
bms/models/props_industrial/powerbox_large_01.phy
bms/models/props_industrial/powerbox_large_01.sw.vtx
bms/models/props_industrial/powerbox_large_01.vvd
hl2/shaders/fxc/bms_Lightmapped_4WayBlend_ps20b.vcs
hl2/shaders/fxc/bms_Lightmapped_4WayBlend_vs20.vcs
mapsrc/Miscellaneous/styleguide_brushwork_truck.vmf
Please move or remove them before you can merge.
Aborting


git did not exit cleanly (exit code 1) (26005 ms @ 06/07/2014 18:25:48)