Fix the automatic conflict resolution that resets to master

Author: hmens-fa

limbo.sh

@@ -65,7 +65,6 @@ handleConflicts() {
         echo -e "\033[0;31mBEWARE ! No action possible, fix the divergence (possible rebase conflicts).\033[0m"
         read -p "Would like to reset your local copy to match the remote one ? (y/N) " reset
         if [ "$reset" == "y" ]; then
-            remoteBranch=$(git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/@@')
             git reset --hard origin/$(git rev-parse --abbrev-ref HEAD)
         fi
         conflictsToSolve=1