Works so-so with conflicts: Auto-merged indexer/mysql.url CONFLICT (content): Merge conflict in indexer/mysql.url 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". Restoring stashed local modifications Cannot restore on top of a dirty state
