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
would find it?
Ideally, you'd get that hint on a merge conflict in a .desktop file, but afaik
that's not possible (it is, but afaik one cannot clone githooks)
Leaving aside the usual suspects (https://techbase.kde.org/Development/Git/*)
it might already be helpful to have it in the scripty commit message?
SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
Cheers,
Thomas
Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<
