Commits · dda833dbddd7884d37950be5b1db937f108f50cd · KDevelop / KDevelop

11 Oct, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · dda833db

Script Kiddy authored Oct 11, 2020

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"

dda833db

17 Aug, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · e1c6fa44

Script Kiddy authored Aug 17, 2020

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"

e1c6fa44

18 Jun, 2020 2 commits

SVN_SILENT made messages (.desktop file) - always resolve ours · 7dfd81aa

Script Kiddy authored Jun 18, 2020

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"

7dfd81aa

SVN_SILENT made messages (.desktop file) - always resolve ours · 99c8c3e9

Script Kiddy authored Jun 18, 2020

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"

99c8c3e9

17 Jun, 2020 2 commits

SVN_SILENT made messages (.desktop file) - always resolve ours · 1363c28f

Script Kiddy authored Jun 17, 2020

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"

1363c28f

SVN_SILENT made messages (.desktop file) - always resolve ours · 819fa2fc

Script Kiddy authored Jun 17, 2020

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"

819fa2fc

13 Apr, 2020 2 commits

SVN_SILENT made messages (.desktop file) - always resolve ours · 1c5c5ae1

Script Kiddy authored Apr 13, 2020

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"

1c5c5ae1

SVN_SILENT made messages (.desktop file) - always resolve ours · 73e76e9b

Script Kiddy authored Apr 13, 2020

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"

73e76e9b

24 Jan, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · ab8dd731

Script Kiddy authored Jan 24, 2020

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"

ab8dd731

21 Jan, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · d9c7403d

Script Kiddy authored Jan 21, 2020

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"

d9c7403d

17 Jan, 2020 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 34e874d7

Script Kiddy authored Jan 17, 2020

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"

34e874d7

11 Dec, 2019 2 commits

SVN_SILENT made messages (.desktop file) - always resolve ours · 10b5beff

Script Kiddy authored Dec 11, 2019

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"

10b5beff

SVN_SILENT made messages (.desktop file) - always resolve ours · 8c631f09

Script Kiddy authored Dec 11, 2019

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"

8c631f09

29 Aug, 2019 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 58838e02

Script Kiddy authored Aug 29, 2019

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"

58838e02

24 Jul, 2019 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 15873f22

Script Kiddy authored Jul 24, 2019

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"

15873f22

22 Jul, 2019 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 8fa9c17e

Script Kiddy authored Jul 22, 2019

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"

8fa9c17e

03 Jun, 2019 2 commits

SVN_SILENT made messages (.desktop file) - always resolve ours · fc201629

Script Kiddy authored Jun 03, 2019

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"

fc201629

SVN_SILENT made messages (.desktop file) - always resolve ours · e4aa40fc

Script Kiddy authored Jun 03, 2019

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"

e4aa40fc

25 Feb, 2019 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 4dd987f5

Script Kiddy authored Feb 25, 2019

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"

4dd987f5

24 Feb, 2019 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · c645bcbe

Script Kiddy authored Feb 24, 2019

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"

c645bcbe

20 Jan, 2019 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 531dc7f8

Script Kiddy authored Jan 20, 2019

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"

531dc7f8

06 Jan, 2019 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 2468045f

Script Kiddy authored Jan 06, 2019

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"

2468045f

04 Nov, 2018 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 843ff743

Script Kiddy authored Nov 04, 2018

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"

843ff743

03 Nov, 2018 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 8f4292e2

Script Kiddy authored Nov 03, 2018

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"

8f4292e2

24 Oct, 2018 2 commits

SVN_SILENT made messages (.desktop file) - always resolve ours · d32c52b0

Script Kiddy authored Oct 24, 2018

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"

d32c52b0

SVN_SILENT made messages (.desktop file) - always resolve ours · 52858040

Script Kiddy authored Oct 24, 2018

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"

52858040

30 Aug, 2018 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · d4d9a740

Script Kiddy authored Aug 30, 2018

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"

d4d9a740

29 Aug, 2018 2 commits

SVN_SILENT made messages (.desktop file) - always resolve ours · 28fad5f2

Script Kiddy authored Aug 29, 2018

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"

28fad5f2

SVN_SILENT made messages (.desktop file) - always resolve ours · 8c76348b

Script Kiddy authored Aug 29, 2018

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"

8c76348b

26 Aug, 2018 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 94ebc6b3

Script Kiddy authored Aug 26, 2018

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"

94ebc6b3

19 Feb, 2018 2 commits

SVN_SILENT made messages (.desktop file) - always resolve ours · b34fa71d

Script Kiddy authored Feb 19, 2018

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"

b34fa71d

SVN_SILENT made messages (.desktop file) - always resolve ours · 81933f5d

Script Kiddy authored Feb 19, 2018

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"

81933f5d

02 Feb, 2018 2 commits

SVN_SILENT made messages (.desktop file) - always resolve ours · 9aca2af1

Script Kiddy authored Feb 02, 2018

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"

9aca2af1

SVN_SILENT made messages (.desktop file) - always resolve ours · b4934d31

Script Kiddy authored Feb 02, 2018

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"

b4934d31

06 Jan, 2018 2 commits

SVN_SILENT made messages (.desktop file) - always resolve ours · 4e3879f7

Script Kiddy authored Jan 06, 2018

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"

4e3879f7

SVN_SILENT made messages (.desktop file) - always resolve ours · 71d6cb98

Script Kiddy authored Jan 06, 2018

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"

71d6cb98

01 Jan, 2018 2 commits

SVN_SILENT made messages (.desktop file) - always resolve ours · 42a8ddee

Script Kiddy authored Jan 01, 2018

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"

42a8ddee

SVN_SILENT made messages (.desktop file) - always resolve ours · c90e0f5b

Script Kiddy authored Jan 01, 2018

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"

c90e0f5b

04 Dec, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · b4fd209b

Script Kiddy authored Dec 04, 2017

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"

b4fd209b

22 Nov, 2017 1 commit
- Revert "serialization: Remove dep on shell in more tests" · 3dfa33f4
  Kevin Funk authored Nov 22, 2017
```
Lots of unintended changes in JSON files...

This reverts commit 7dabf54c.
```
  3dfa33f4