On 05/26/2011 08:19 AM, Charles Plessy wrote:
Le Thu, May 26, 2011 at 08:08:20AM +0200, Alex Mestiashvili a écrit :
Would it be possible just to roll back to latest commit done by you
, and start over from that point with my changes and the new
upstream 1.0.2 ?
Yes, this is something that I was considering: recover your changes with
git-format-patches, reset (--hard) to the latest clean commit, and apply the
relevant patches with git am.
Cheers,
Hi Charles ,
I've tried reset --hard , but when I was applying the patches with
git-am I was getting errors like
error: AUTHORS: already exists in index ...
I also tried reset --soft but I can't push changes to the remote .
for example I do :
git clone
git reset --soft 0b7256275dc8b8f7495a46b6b33739573fd0d1c0
git add .
git commit -a
and git log shows my commit right after yours .
but it get's rejected :
! [rejected] master -> master (non-fast-forward)
! [rejected] pristine-tar -> pristine-tar (non-fast-forward)
Is it possible to roll back everything as it was before my commits in
the repository ?
Alex
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
