[note: we had some issues with the repository resulting from the GAIA/
SAMP merge. if you did a git pull during the day on Monday you'll need
to fix things up if you ever intend to do a push][
On Jun 29, 2009, at 2:25 PM, Tim Jenness wrote:
>
> I think this is confusing enough that I am going to attempt to fix it.
> This will change the commits on the SAMP stuff and Malcolm's
> subsequently committed work but a simple git-reset and pull tomorrow
> will sort it out. I'll send instructions when I'm done.
>
so is now done. For those of you that have not pulled since Saturday
there will be no issues.
For people that have pulled since and have Mark's SAMP patches the
repository will now have a set of commits that are not known to you.
If you pull now you will create an additional branch in the history
and things will get worse.
The simple fix is
% git reset --hard 131f1308b
% git pull
if you've committed any work on Monday that was not pushed then you
should dump that out using git format-patch before doing the reset and
the pull. Then use git-am to reapply it and proceed as normal.
--
Tim Jenness
Joint Astronomy Centre
|