gistfile1.txt

git -c diff.mnemonicprefix=false -c core.quotepath=false fetch main

git -c diff.mnemonicprefix=false -c core.quotepath=false pull --no-commit --rebase main master
From https://github.com/MinecraftForge/MinecraftForge
 * branch            master     -> FETCH_HEAD


First, rewinding head to replay your work on top of it...

error: The following untracked working tree files would be overwritten by checkout:
	fml/.gitattributes
	fml/.gitignore
	fml/CREDITS-fml.txt
	fml/LICENSE-fml.txt
	fml/README.txt
	fml/build.gradle
	fml/conf/astyle.cfg
	fml/conf/exceptor.json
	fml/conf/joined.exc
	fml/conf/joined.srg
	fml/conf/mcp.cfg
	fml/conf/patches/Start.java
	fml/conf/patches/minecraft_ff/net.minecraft.client.Minecraft.java.patch
	fml/conf/patches/minecraft_ff/net.minecraft.client.Minecraft.java.patch.2
	fml/conf/patches/minecraft_ff/net.minecraft.client.gui.FontRenderer.java.patch
	fml/conf/patches/minecraft_ff/net.minecraft.client.network.NetHandlerPlayClient.java.patch
	fml/conf/patches/minecraft_ff/net.minecraft.client.particle.EffectRenderer.java.patch
	fml/conf/patches/minecraft_ff/net.minecraft.client.renderer.block.model.ModelBlockDefinition.java.patch
	fml/conf/patches/minecraft_ff/net.minecraft.client.renderer.texture.TextureManager.java.patch

	fml/conf/patches/minecraft_ff/net.minecraft.client.resources.FolderResourcePack.java.patch
	fml/conf/patches/minecraft_ff/net.minecraft.command.PlayerSelector.java.patch
	fml/conf/patches/minecraft_ff/net.minecraft.inventory.ContainerPlayer.java.patch
	fml/conf/patches/minecraft_ff/net.minecraft.network.PacketBuffer.java.patch
	fml/conf/patches/minecraft_ff/net.minecraft.server.network.NetHandlerLoginServer.java.patch
	fml/conf/patches/minecraft_ff/net.minecraft.util.BlockPos.java.patch
	fml/conf/patches/minecraft_ff/net.minecraft.world.storage.ThreadedFileIOBase.java.patch
	fml/conf/version.cfg
	fml/eclipse-workspace-dev.zip
	fml/gradle/wrapper/gradle-wrapper.jar
	fml/gradle/wrapper/gradle-wrapper.properties
	fml/gradlew
	fml/gradlew.bat
	fml/install/README.txt
	fml/install/build.gradle
	fml/install/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.location
	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/install/src/main/java/com/example/examplemod/ExampleMod.java
	fml/install/src/main/resources/mcmod.info
	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/1.6.3-dev.json
	fml/jsons/1.6.3-rel.json
	fml/jsons/1.6.4-dev.json
	fml/jsons/1.6.4-rel.json

	fml/jsons/1.7.10-dev.json
	fml/jsons/1.7.10-pre3-dev.json
	fml/jsons/1.7.10-pre3.json
	fml/jsons/1.7.10-pre4-dev.json
	fml/jsons/1.7.10-pre4-rel.json
	fml/jsons/1.7.10-pre4.json
	fml/jsons/1.7.10-rel.json

	fml/jsons/1.7.10.json
	fml/jsons/1.7.2-dev.json
	fml/jsons/1.7.2-rel.json
	fml/jsons/1.7.2.json
	fml/jsons/1.7.9-dev.json
	fml/jsons/1.7.9-rel.json
	fml/jsons/1.7.9.json
	fml/jsons/1.8-dev.json

	fml/jsons/1.8-rel.json
	fml/jsons/1.8.json
	fml/jsons/big_logo.png
	fml/mcp_merge.cfg
	fml/patches/minecraft/net/minecraft/block/Block.java.patch
	fml/patches/minecraft/net/minecraft/client/ClientBrandRetriever.java.patch
	fml/patches/minecraft/net/minecraft/client/LoadingScreenRenderer.java.patch

	fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch
	fml/patches/minecraft/net/minecraft/client/gui/GuiButton.java
Aborting



























could not detach HEAD