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

[David Jarvie]

On Thu, January 27, 2011 11:24 pm, David Jarvie wrote:
> 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?

I just managed to fix it after all. I'd forgotten that I'd previously done
a merge into my local master before doing the pull. After undoing that
merge, 'git pull' worked, and then I could reapply the local merge.

-- 
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/