This is the mail archive of the
mailing list for the Archer project.
Re: Apologies for wrong commit error
- From: Jan Kratochvil <jan dot kratochvil at redhat dot com>
- To: Pierre Muller <pierre dot muller at ics-cnrs dot unistra dot fr>
- Cc: archer at sourceware dot org
- Date: Sat, 19 Mar 2011 22:45:49 +0100
- Subject: Re: Apologies for wrong commit error
- References: <006b01cbe67d$7f308da0$7d91a8e0$@email@example.com>
On Sat, 19 Mar 2011 22:34:58 +0100, Pierre Muller wrote:
> Could someone with enough git knowledge
> check that the second did exactly cancel the first wrong commit?
It seems OK now to me.
git diff cdf4dfaa567c4903b2fce0a16a2e5702e059932e..c40415cfe4d602ded27d296c771006609596d5f4
shows no change.
> Can an admin completely wipe my error out?
AFAIK it should not affect operations with master. It is now more a problem
for the archer-muller-windows-multi branch as AFAIK there is no way to do a
real undo of a GIT merge. GIT will now still think the current version of
archer-muller-windows-multi is already present in master, therefore this
command now no longer shows what has changed on archer-muller-windows-multi
(even if master has more recent updates):
git diff origin/master...origin/archer-muller-windows-multi