MinecraftForge on GitHub - having trouble committing & pushing FML packages

Hi All

I'm trying to make some changes to SimpleNetworkWrapper in my fork of MinecraftForge, but I'm having trouble getting it to commit & track my changes properly.

For some reason (legacy issue from FML being a submodule?) the FML package is located in two places

C:\Users\TGG\EclipseProjects\MinecraftForge\eclipse\Forge\src\main\java\net\minecraftforge\fml (compiled into the project)

and

C:\Users\TGG\EclipseProjects\MinecraftForge\fml  (synced with the repo)

I can make changes to the project location, but if I want them to be committed and pushed to GitHub, then I need to copy the files over to the "repo" location.  Vica versa for updating from the GitHub repo.

If I keep doing it like this, guaranteed I'm eventually going to copy the wrong way and destroy an evening's work.

Is there a better way?  What am I missing (not really up to speed with Eclipse yet; since IntelliJ seems to break in strange ways with this project)?

-TGG

Rather than copying files, get a program like Beyond Compare.

It'll let you select two folder locations and do a recursive scan, looking for changed files (a quick scan just looks at last-modified, takes a fraction of a second, and is usually good enough).  That way you are always making sure to merge in the right direction: red files overwrite black files.

The Forge repo is going through a shift. We're trying to clean it up so it isnt two projects. But as is. the 'fml' folder can be treated exactly like the old FML repo. which includes the fact that you can use FG inside it to setup a workspace.