[Kde-pim] How to resolve merge conflicts after 'git pull'

[David Jarvie]

I've got into a horrible tangle after doing 'git pull --rebase' on my
local kdepim 'master' branch (which is mapped to the repository master
branch). I tried editing files and then doing 'git add', but couldn't sort
things out. All I want to do is to make my local master be the same as the
remote master. What can be done?

The terminal output from 'git pull --rebase' was:

First, rewinding head to replay your work on top of it...
Applying Move single file KAlarm resource into separate directory.
.dotest/patch:496: trailing whitespace.

.dotest/patch:570: trailing whitespace.
Comment[el]=Φόρτωση
δεδομένων από
ένα αρχείο
ημερολογίου
του KAlarm
error: patch failed: kalarm/CMakeLists.txt:1
error: kalarm/CMakeLists.txt: patch does not apply
error: patch failed: kalarm/akonadi/CMakeLists.txt:9
error: kalarm/akonadi/CMakeLists.txt: patch does not apply
error: kalarm/akonadi/kalarm/CMakeLists.txt: already exists in index
error: kalarm/akonadi/kalarm/kalarmresource.cpp: already exists in index
error: kalarm/akonadi/kalarm/kalarmresource.desktop: already exists in index
error: kalarm/akonadi/kalarm/kalarmresource.h: already exists in index
error: kalarm/akonadi/kalarm/kalarmresource.kcfg: already exists in index
error: kalarm/akonadi/kalarm/kalarmresource_active.desktop: already exists
in index
error: kalarm/akonadi/kalarm/kalarmresource_archived.desktop: already
exists in index
error: kalarm/akonadi/kalarm/kalarmresource_template.desktop: already
exists in index
error: kalarm/akonadi/kalarm/settings.kcfgc: already exists in index
error: kalarm/akonadi/kalarmresource.cpp: does not exist in index
error: kalarm/akonadi/kalarmresource.desktop: does not exist in index
error: kalarm/akonadi/kalarmresource.h: does not exist in index
error: kalarm/akonadi/kalarmresource.kcfg: does not exist in index
error: kalarm/akonadi/kalarmresource_active.desktop: does not exist in index
error: kalarm/akonadi/kalarmresource_archived.desktop: does not exist in
index
error: kalarm/akonadi/kalarmresource_template.desktop: does not exist in
index
error: kalarm/akonadi/settings.kcfgc: does not exist in index
Using index info to reconstruct a base tree...
<stdin>:496: trailing whitespace.

<stdin>:570: trailing whitespace.
Comment[el]=Φόρτωση
δεδομένων από
ένα αρχείο
ημερολογίου
του KAlarm
warning: 2 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Renamed
kalarm/akonadi/kalarmresource.cpp->kalarm/akonadi/kalarm/kalarmresource.cpp
Auto-merged kalarm/akonadi/kalarm/kalarmresource.cpp
CONFLICT (content): merge conflict in
kalarm/akonadi/kalarm/kalarmresource.cpp
CONFLICT (rename/rename): Rename
"kalarm/akonadi/kalarmresource.kcfg"->"kjots/maildirresource.kcfg" in
branch "HEAD" rename
"kalarm/akonadi/kalarmresource.kcfg"->"kalarm/akonadi/kalarm/kalarmresource.kcfg"
in "Move single file KAlarm resource into separate directory."
CONFLICT (rename/rename): Rename
"kalarm/akonadi/settings.kcfgc"->"kalarm/akonadi/kalarmdir/settings.kcfgc"
in branch "HEAD" rename
"kalarm/akonadi/settings.kcfgc"->"kalarm/akonadi/kalarm/settings.kcfgc" in
"Move single file KAlarm resource into separate directory."
Auto-merged kalarm/CMakeLists.txt
Auto-merged kalarm/akonadi/CMakeLists.txt
CONFLICT (content): Merge conflict in kalarm/akonadi/CMakeLists.txt
Auto-merged kalarm/akonadi/kalarm/CMakeLists.txt
CONFLICT (add/add): Merge conflict in kalarm/akonadi/kalarm/CMakeLists.txt
Failed to merge in the changes.
Patch failed at 0001.

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".

-- 
David Jarvie.
KDE developer.
KAlarm author - http://www.astrojar.org.uk/kalarm

_______________________________________________
KDE PIM mailing list kde-pim at kde.org
https://mail.kde.org/mailman/listinfo/kde-pim
KDE PIM home page at http://pim.kde.org/