Commits · 71d6cb98a58a5a2ba8665a4226b67688b1cce343 · blobfish / kdevelop

06 Jan, 2018 1 commit

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 1 commit

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 3 commits
- 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
- serialization: Remove dep on shell in more tests · 7dabf54c
  Kevin Funk authored Nov 22, 2017
  
  7dabf54c
- SVN_SILENT made messages (.desktop file) - always resolve ours · 166ac4e4
  Script Kiddy authored Nov 22, 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"
```
  166ac4e4
21 Nov, 2017 1 commit

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

Script Kiddy authored Nov 21, 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"

80536b4c

24 Oct, 2017 1 commit

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

Script Kiddy authored Oct 24, 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"

482e5ee6

17 Oct, 2017 1 commit

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

Script Kiddy authored Oct 17, 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"

5aca467f

13 Sep, 2017 1 commit

Restructure kdevelop.git layout · bd9d1e30

Kevin Funk authored Sep 05, 2017

As discussed on the mailing list:
  https://mail.kde.org/pipermail/kdevelop-devel/2017-September/058823.html

Move all plugins into a single folder:
- $CATEGORY/$PLUGINFOLDER -> plugins/$PLUGINFOLDER
- kdevplatform/plugins/$PLUGINFOLDER -> plugins/$PLUGINFOLDER

bd9d1e30

06 Sep, 2017 1 commit

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

Script Kiddy authored Sep 06, 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"

5fc8263c

04 Sep, 2017 1 commit

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

Script Kiddy authored Sep 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"

a1ca46b9

02 Sep, 2017 1 commit

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

Script Kiddy authored Sep 02, 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"

c8f869e7

01 Sep, 2017 2 commits

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

Script Kiddy authored Sep 01, 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"

65f2e7de

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

Script Kiddy authored Sep 01, 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"

cf680d32

30 Aug, 2017 2 commits

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

Script Kiddy authored Aug 30, 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"

4220f830

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

Script Kiddy authored Aug 30, 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"

ced61b50

29 Aug, 2017 1 commit

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

Script Kiddy authored Aug 29, 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"

36715f37

21 Aug, 2017 1 commit

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

Script Kiddy authored Aug 21, 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"

701285b0

11 Aug, 2017 1 commit

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

Script Kiddy authored Aug 11, 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"

ab4df19d

10 Aug, 2017 1 commit

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

Script Kiddy authored Aug 10, 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"

8df47a3c

09 Aug, 2017 1 commit

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

Script Kiddy authored Aug 09, 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"

93d22be8