[kdevplatform] [Bug 374898] Missing command line flag "-u" for the pull command.

2017-01-17 Thread Sergey Kalinichev
https://bugs.kde.org/show_bug.cgi?id=374898 Sergey Kalinichev changed: What|Removed |Added Resolution|--- |WONTFIX Status|UNCONFIRMED

[kdevplatform] [Bug 374898] Missing command line flag "-u" for the pull command.

2017-01-12 Thread Frank Fischer
https://bugs.kde.org/show_bug.cgi?id=374898 --- Comment #1 from Frank Fischer --- I'm not sure about this anymore. Apparently, git updates only files on pull that do not have any conflicts. Mercurial's pull -u, however, would force a merge (possibly leaving conflict markers in the file). Accordi

[kdevplatform] [Bug 374898] Missing command line flag "-u" for the pull command.

2017-01-11 Thread Kevin Funk
https://bugs.kde.org/show_bug.cgi?id=374898 Kevin Funk changed: What|Removed |Added CC||kalinichev.s...@gmail.com -- You are receiving th

[kdevplatform] [Bug 374898] Missing command line flag "-u" for the pull command.

2017-01-11 Thread Frank Fischer
https://bugs.kde.org/show_bug.cgi?id=374898 Frank Fischer changed: What|Removed |Added Version|unspecified |git master -- You are receiving this mail beca

[kdevplatform] [Bug 374898] Missing command line flag "-u" for the pull command.

2017-01-11 Thread Frank Fischer
https://bugs.kde.org/show_bug.cgi?id=374898 Frank Fischer changed: What|Removed |Added CC||frank-fischer@shadow-soft.d |