search

FMCorz / mdk

Moodle Development Kit. A collection of tools meant to make developers' lives easier.
GNU General Public License v3.0
86 stars 47 forks source link

Auto-resolve conflicts with bootstrapbase on backport #76

Closed FMCorz closed 10 years ago

FMCorz commented 10 years ago

I can get to work, but I have problems when I need to call git cherry-pick --continue as it opens vim.

FMCorz commented 10 years ago

Thanks to Damyon, commit -F .git/MERGE_MSG followed by a cherry-pick --continue works.