error: The following untracked working tree files would be overwritten by checkout:
	fml/.gitattributes
	fml/.gitignore
	fml/LICENSE-fml.txt
	fml/conf/astyle.cfg
	fml/conf/fields.csv
	fml/conf/joined.exc
	fml/conf/joined.srg
	fml/conf/mcp.cfg
	fml/conf/methods.csv
	fml/conf/params.csv
	fml/conf/patches/Start.java
	fml/conf/version.cfg
	fml/eclipse-workspace-dev.zip
	fml/install/README.txt
	fml/install/eclipse/.metadata/.plugins/org.eclipse.core.resources/.root/0.tree
	fml/install/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs
	fml/install/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs
	fml/install/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.epp.usagedata.gathering.prefs
	fml/install/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs
	fml/install/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs
	fml/install/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
	fml/install/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs
	fml/install/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Client.launch
	fml/install/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Server.launch
	fml/install/eclipse/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	fml/jsons/1.6-dev.json
	fml/jsons/1.6-rel.json
	fml/jsons/1.6.1-dev.json
	fml/jsons/1.6.1-rel.json
	fml/jsons/1.6.2-dev.json
	fml/jsons/1.6.2-rel.json
	fml/jsons/big_logo.png
	fml/mcp_merge.cfg
	fml/patches/minecraft/net/minecraft/client/ClientBrandRetriever.java.patch
	fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch
	fml/patches/minecraft/net/minecraft/client/gui/GuiCreateWorld.java.patch
	fml/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.java.patch
	fml/patches/minecraft/net/minecraft/client/renderer/RenderBlocks.java.patch
	fml/patches/minecraft/net/minecraft/client/renderer/entity/RenderVillager.java.patch
	fml/patches/minecraft/net/minecraft/client/resources/LanguageManager.java.patch
	fml/patches/minecraft/net/minecraft/client/settings/GameSettings.java.patch
	fml/patches/minecraft/net/minecraft/crash/CrashReport.java.patch
	fml/patches/minecraft/net/minecraft/entity/EntityList.java.patch
	fml/patches/minecraft/net/minecraft/entity/EntityTracker.java.patch
	fml/patches/minecraft/net/minecraft/entity/EntityTrackerEntry.java.patch
	fml/patches/minecraft/net/minecraft/entity/boss/IBossDisplayData.java.patch
	fml/patches/minecraft/net/minecraft/entity/item/EntityItem.java.patch
	fml/patches/minecraft/net/minecraft/entity/monster/EntitySlime.java.patch
	fml/patches/minecraft/net/minecraft/entity/passive/EntityVillager.java.patch
	fml/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch
	fml/patches/minecraft/net/minecraft/inventory/SlotCrafting.java.patch
	fml/patches/minecraft/net/minecraft/inventory/SlotFurnace.java.patch
	fml/patches/minecraft/net/minecraft/item/Item.java.patch
	fml/patches/minecraft/net/minecraft/item/ItemMap.java.patch
	fml/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch
	fml/patches/minecraft/net/minecraft/server/dedicated/DedicatedServer.java.patch
	fml/patches/minecraft/net/minecraft/server/integrated/IntegratedServer.java.patch
	fml/patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.java.patch
	fml/patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch
	fml/patches/minecraft/net/minecraft/tileentity/TileEntityFurnace.java.patch
	fml/patches/minecraft/net/minecraft/util/ResourceLocation.java.patch
	fml/patches/minecraft/net/minecraft/util/StringTranslate.java.patch
	fml/patches/minecraft/net/minecraft/world/World.java.patch
	fml/patches/minecraft/net/minecraft/world/WorldProvider.java.patch
	fml/patches/minecraft/net/minecraft/world/WorldType.java.patch
	fml/patches/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java.patch
	fml/patches/minecraft/net/minecraft/world/gen/ChunkProviderServer.java.patch
	fml/patches/minecraft/net/minecraft/world/gen/structure/StructureVillagePieces.java.patch
	fml/patches/minecraft/net/minecraft/world/storage/MapData.java.patch
	fml/patches/minecraft/net/minecraft/world/storage/SaveHandler.java.patch
	fml/patches/minecraft/net/minecraft/world/storage/WorldInfo.java.patch
Please move or remove them before you can switch branches.
Aborting