>> It seems to be tricky to pull all your changes except this one, so
>> shall we hold off on the pull until you're ready with the changes?
>
> Are you getting conflicts, or just unsure of how to do this with Git?
Not conflicts. I just can't see a way to pull all your changes up to
but *not* including the latest one. You can do cherry-picking, but I
believe that has implications that mean it's not a great solution,
particularly if we want to merge your fork again later.
Peter
---------------------------------------------------------------------
To unsubscribe from this list, please visit:
http://xircles.codehaus.org/manage_email