El Dimarts, 10 de març de 2015, a les 16:28:18, Thomas Lübking va escriure:
On Dienstag, 10. März 2015 00:14:12 CEST, Albert Astals Cid wrote:
El Dilluns, 9 de març de 2015, a les 14:08:40, Thomas Lübking va escriure:
On Sonntag, 8. März 2015 23:21:59 CEST, Albert Astals Cid wrote: ...
On Dienstag, 10. März 2015 00:14:12 CEST, Albert Astals Cid wrote:
El Dilluns, 9 de març de 2015, a les 14:08:40, Thomas Lübking va escriure:
On Sonntag, 8. März 2015 23:21:59 CEST, Albert Astals Cid wrote: ...
That's a not so bad idea, what do others think? Would you think to read the
On Sonntag, 8. März 2015 23:21:59 CEST, Albert Astals Cid wrote:
Short answer: The one you're in (i.e. in this case i guess HEAD/master)
¡Muchas Gracias!
I have the feeling this has been asked/answered quite a few
times, anyone has any idea of a place where to put such a FAQ so that people
On Montag, 9. März 2015 09:47:20 CEST, Kevin Funk wrote:
This is easy to automate with .gitattributes, for the record
Wuohohooo... wait!
That would also kill real fixes (typos, removed/added keys) on merging and if
you didn't think of it, you'll have it fixed in branch and re-broken in
El Dilluns, 9 de març de 2015, a les 14:08:40, Thomas Lübking va escriure:
On Sonntag, 8. März 2015 23:21:59 CEST, Albert Astals Cid wrote:
Short answer: The one you're in (i.e. in this case i guess HEAD/master)
¡Muchas Gracias!
I have the feeling this has been asked/answered quite a few
On Sunday 08 March 2015 23:21:59 Albert Astals Cid wrote:
El Diumenge, 8 de març de 2015, a les 22:00:33, Thomas Lübking va escriure:
merging 5.2 into master gets me several merge conflicts in desktop
services, which I cannot reasonably resolve, mostly because:
++ HEAD
merging 5.2 into master gets me several merge conflicts in desktop services,
which I cannot reasonably resolve, mostly because:
++ HEAD
+Comment[zh_TW]=桌面效果使用的組合器設定
++===
+ Comment[zh_TW]=桌面效果使用的組合器組態
++ Plasma/5.2
I cannot read that (nor other translations)
= which branch to I pick?
El Diumenge, 8 de març de 2015, a les 22:00:33, Thomas Lübking va escriure:
merging 5.2 into master gets me several merge conflicts in desktop services,
which I cannot reasonably resolve, mostly because:
++ HEAD
+Comment[zh_TW]=桌面效果使用的組合器設定
++===
+ Comment[zh_TW]=桌面效果使用的組合器組態
++
