[LRUG] git question

[Tom Stuart]

On 20 Aug 2009, at 11:59, Taryn East wrote:
> Every couple of days I did a git pull and rebase.
> I had several chunks of functionality to send in - and wanted four  
> separate patches but the very first of these wouldn't apply as the  
> code of the underlying file (ActiveResource::Validations)  had  
> changed, so the patch was saying that it referred to line 8 - and  
> line 8 no longer matched where the changes had been made.

This is sort of a contradiction in terms if the rebase succeeded. Your  
commits are by definition a set of changes on top of the remote master  
(assuming you're up-to-date with it) so your patches should always  
apply. How are you actually creating the patches?

Cheers,
-Tom