Hacky script for helping with extensive rebases if you primarily only care about the changes from the current branch

rebaseResolver.sh

#!/bin/bash

current_status=$(git status)

handleRebaseStatus() {
    local status_string=$1
    local git_resolution=$2

    paths_to_resolve=$(echo "${current_status}" | pcregrep -o2 "(?<=${status_string}:)(\s*)(.+)")

    echo "RESOLVING \"${status_string}\""
    for path in $paths_to_resolve
    do
        git "${git_resolution}" "${path}"
    done
}

handleRebaseStatus "added by us" "rm"
handleRebaseStatus "deleted by us" "rm"

handleRebaseStatus "added by them" "add"
handleRebaseStatus "deleted by them" "rm"

handleRebaseStatus "both modified" "add"

git rebase --continue