[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
How can I use git to help me merge a patch with the new directory struct
How can I use git to help me merge a patch with the new directory structure
Sat, 25 Jul 2009 22:37:57 -0600
As you're aware, I've been working on a patch for autobeaming.
It affects c++, scheme, and documentation files.
Now I want to apply the patch to master. But the problem is that all of the
documentation files have moved to Documentation/ISOLANG/notation instead of
So this seems to break any means of making my patch apply.
Any git gurus out there who have an idea of how I can do this without having
to manually apply patches made between the files in the different
Any help would be appreciated; right now I feel like all of my work on
autobeaming is in shambles and I'm going to have to do it all over again.