Discussion:
[Freecol-developers] For Merge #40, restoring build/
Michael Jeffers
2016-12-15 00:22:37 UTC
Permalink
Hello all,

We are working to get the merge request cleaned up, and noticed that the
build directory got wiped out through some, perhaps erroneous, use of the
ant script. We were able to restore the files from the commit prior to
the one that wiped them, but now they show up as newly added/edited files.

Naturally this will make the merge diff look even worse than before.

How can one reverse these changes made some commit long ago, that doesn't
have it register as a new commit over the current HEAD?

-Mike
Michael T. Pope
2016-12-15 08:52:49 UTC
Permalink
On Wed, 14 Dec 2016 19:22:37 -0500
Post by Michael Jeffers
We are working to get the merge request cleaned up, and noticed that the
build directory got wiped out through some, perhaps erroneous, use of the
ant script.
I saw that and wondered what had happened.
Post by Michael Jeffers
How can one reverse these changes made some commit long ago, that doesn't
have it register as a new commit over the current HEAD?
I do not know an elegant way, but I am no great git expert. I would just
make a new branch and use "git cherry-pick" to add in the commits that did
not touch the build directory.

Cheers,
Mike Pope

Loading...