Upstream version is 1.0.1 Importing '../../113305-bangarang-1.0.1.tar.gz' to branch 'upstream'... Switched to branch 'upstream' [upstream e9a36e7] Imported Upstream version 1.0.1 35 files changed, 7212 insertions(+), 2286 deletions(-) rewrite data/bangarang.desktop (61%) create mode 100644 translations/cz/CMakeLists.txt create mode 100644 translations/cz/bangarang.po create mode 100644 translations/it/CMakeLists.txt create mode 100644 translations/it/bangarang.po create mode 100644 translations/pl/CMakeLists.txt create mode 100644 translations/pl/bangarang.po create mode 100644 translations/pt_BR/CMakeLists.txt create mode 100644 translations/pt_BR/bangarang.po pristine-tar: committed bangarang_1.0.1.orig.tar.gz.delta to branch pristine-tar Merging to 'master' Switched to branch 'master' Auto-merging src/infomanager.cpp Auto-merging src/main.cpp CONFLICT (content): Merge conflict in src/main.cpp Auto-merging src/mainwindow.cpp Auto-merging src/mainwindow.h Auto-merging src/mediaitemdelegate.cpp CONFLICT (content): Merge conflict in src/mediaitemdelegate.cpp Auto-merging src/platform/audiostreamlistengine.h Auto-merging src/platform/cdlistengine.cpp Auto-merging src/platform/cdlistengine.h Auto-merging src/platform/dvdlistengine.cpp Auto-merging src/platform/dvdlistengine.h Auto-merging src/platform/filelistengine.cpp Auto-merging src/platform/musiclistengine.h Auto-merging src/platform/playlist.cpp Auto-merging src/platform/playlist.h Auto-merging src/platform/savedlistsengine.h Auto-merging src/platform/utilities.cpp Auto-merging translations/de/bangarang.po CONFLICT (content): Merge conflict in translations/de/bangarang.po Auto-merging translations/fr/bangarang.po CONFLICT (content): Merge conflict in translations/fr/bangarang.po Auto-merging translations/nl/bangarang.po CONFLICT (content): Merge conflict in translations/nl/bangarang.po Automatic merge failed; fix conflicts and then commit the result. git returned 1 Couldn't merge from "upstream/1.0.1" Merge failed, please resolve.