| Re: [translations] Web-it update patch |
[ Thread Index |
Date Index
| More lilynet.net/translations Archives
]
- To: John Mandereau <john.mandereau@xxxxxxxxx>
- Subject: Re: [translations] Web-it update patch
- From: Federico Bruni <fedelogy@xxxxxxxxx>
- Date: Tue, 23 Nov 2010 20:30:32 +0100
- Cc: Francisco Vila <paconet.org@xxxxxxxxx>, Translations list at lilynet <translations@xxxxxxxxxxx>
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:cc :in-reply-to:references:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; bh=0UXlOhBo+iad1Clu242QbnT5xQ7g7opG6jQojWp8rZ4=; b=S2jX3TmIyzc9WCY+i4xKWfRxzmOUxRAz9lyHfE1BO5c25Ri+DgjfNe2ywHpICcZxzk 1DsWhH2ebKAFgKTTdB7RxE66TQp27VjiXMOv8BiSQbdgZLdXv13BR/zYIITs5aXgjpUX gRSBqWjOuTUIuFWgSJyUXMuNgsuSA02C0CYo8=
- Domainkey-signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:in-reply-to:references:content-type:date :message-id:mime-version:x-mailer:content-transfer-encoding; b=DTHCzatJZwqKofv1tGSZyCSG89eXoiNIwoE7CNTe1e2yDy3CQgvIGv/AN25Dtpk2aH vyRwftXk2L9Y5G3SYCM9is5+mn5IEJLkhDDVZ3Tv90z0S4H0hHdl9CPkVj9IQ9AX2Cte /TLa2Xhjenhb96CbnZ4zu6u5fnLvA3oDkc/4k=
Il giorno mar, 23/11/2010 alle 10.02 +0100, John Mandereau ha scritto:
> No, pushing would just throw in redundant history (authorship would be
> identical as well), best is to
>
> git reset --hard origin/lilypond/translation
>
> In this case, it is safe, but please always check with a diff to
> origin/lilypond/translation (as we did in this thread) to check that you
> do not lose anything.
>
Ok, I've done it. Now it's ok.
I wonder what should I do if something similar will happen again. I
mean, if you fix some error in my patch and then you apply it (this is
quite likely to happen, even though from now on I'll try at least to fix
trailing spaces before sending the patch).
I guess I should rebase if I haven't done any change to my local copy
after sending the patch (otherwise I'll lose my work).
Right? (this is my understanding of what you wrote below)
Il giorno lun, 22/11/2010 alle 16.20 +0100, John Mandereau ha scritto:
> Il giorno lun, 22/11/2010 alle 16.02 +0100, Federico Bruni ha scritto:
>
>
> > I'll send them in the late evening, when I'm back home.
> > Anyway, I didn't push my commits... I should have run 'git push'
> > before 'git pull'?
>
> In case you haven't committed newer stuff, you shouldn't push but
rebase
> so it eliminates some history which is duplicate up to trailing
> whitespace. We'll see this tonight.
If I have commited new stuff, I guess I should merge "in a clean way".
Well, we'll see it when/if it happens :)
Cheers,
Federico
PS What do you recommend to trim trailing spaces?
I've found this Gedit plugin, trailsave (no longer maintained):
http://users.tkk.fi/~otsaloma/gedit/
I may give it a try..
I've read also about a git configuration...
Please let me know what yuo use.
Thanks!