Re: Question about git

[Gil Forcada <gforcada gnome org>]

El dl 04 de 05 de 2009 a les 23:00 +0200, en/na Milo Casagrande va
escriure:
> Hi,
> 
> here I come again with silly question about git. :)
> 
> I did look at the documentation, but didn't find an answer so maybe some
> more involved git user could tell me if it's possible or not.
> 
> Is it possible to merge a single file from two different branches?
> 
> Say I commit a translation in gnome-2-26 and I want to port the same
> translation to master, do I have to do it "manually" (as I'm doing it
> now)?
> 
> By "manually" I intend: switch to the other branch and re-copy again the
> same po file.

/me wants to know this also, anyone?

> Thanks.
> 
> Ciao.
> 
> _______________________________________________
> gnome-i18n mailing list
> gnome-i18n gnome org
> http://mail.gnome.org/mailman/listinfo/gnome-i18n
-- 
gil forcada

[ca] guifi.net - una xarxa lliure que no para de créixer
[en] guifi.net - a non-stopping free network
bloc: http://gil.badall.net