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"
Status | Job ID | Name | Coverage | ||||||
---|---|---|---|---|---|---|---|---|---|
Test | |||||||||
failed |
#27473
allowed to fail
|
clazy |
00:00:53
|
|
|||||
passed |
#27474
|
qmllint |
00:00:22
|
|
|||||
Build | |||||||||
passed |
#27478
|
archlinux |
00:01:25
|
|
|||||
passed |
#27477
|
debian-sid |
00:01:06
|
|
|||||
passed |
#27476
|
neon-bionic |
00:01:22
|
|
|||||
passed |
#27475
|
ubuntu-trusty |
00:01:11
|
|
|||||
Deploy | |||||||||
passed |
#27481
|
android |
00:09:57
|
|
|||||
failed |
#27479
allowed to fail
|
linux-appimage |
00:11:10
|
|
|||||
passed |
#27482
|
mac-osxcross |
00:07:09
|
|
|||||
passed |
#27480
|
windows-mxe |
00:05:43
|
|
|||||
Name | Stage | Failure | ||
---|---|---|---|---|
failed
|
linux-appimage | Deploy | ||
|
||||
failed
|
clazy | Test | ||
|