SVN_SILENT made messages (.desktop file) - always resolve mine-conflict
R883:1514130
Actions

Description

SVN_SILENT made messages (.desktop file) - always resolve mine-conflict

In case of conflict in i18n, keep the version of the branch "--accept mine-conflict"
To resolve a particular conflict, "svn resolve --accept mine-full path/to/file.desktop"

Details

Committed

scripty

Apr 17 2018, 5:26 AM

Parents

R883:1514129: SVN_SILENT made messages (.po file, second try)

Branches

Unknown

Tags

Unknown

scripty committed R883:1514130: SVN_SILENT made messages (.desktop file) - always resolve mine-conflict.Apr 17 2018, 5:26 AM

Changes (5)

				Path	Packages
	M			branches/stable/l10n-kf5/en/messages/extragear-edu/gcompris_qt.po
	M			branches/stable/l10n-kf5/en/messages/extragear-libs/kdb_qt.po
	M			branches/stable/l10n-kf5/en/messages/extragear-network/falkon_qt.po
	M			branches/stable/l10n-kf5/en/messages/kdeedu/marble_qt.po
	M			branches/stable/l10n-kf5/en/messages/kdesdk/kcachegrind_qt.po