pride update blows up on branch after merging and making another local change

[gnagy]

I was working on a branch. I merged master onto my branch and then made another commit on my branch, without pushing it. Pride update blew up with a rebase conflict.

Pride tried to rebase my local branch onto a commit on the remote branch but my local branch already contained those changes. Git status during rebase gives:

You are currently rebasing branch 'test' on '7dfc05a'.

git log gives:

*   11e63ce (HEAD, test) test settings 2
|\
| * e4dadd2 (origin/master, master) master settings 2
* | 7dfc05a (origin/test) test settings
|/
* f1c4e15 master settings

Here is a shell script to reproduce:

#!/bin/sh

# create pride
rm -rf /tmp/pridetest
mkdir -p /tmp/pridetest
cd /tmp/pridetest
mkdir .tmp
git init --bare /tmp/pridetest/.tmp/test.git

pride init
pride add -B /tmp/pridetest/.tmp/ test.git

# init master
cd test.git
git checkout -b master
echo "master settings" > settings.gradle
git add -A
git commit -m "master settings"
git push -u origin master

# make change on branch
git checkout -b test
echo "test settings" > settings.gradle
git add -A
git commit -m "test settings"
git push -u origin test

# make change on master (upstream change)
git checkout master
echo "master settings 2" > settings.gradle
git commit -a -m "master settings 2"
git push

# merge master onto my branch
git checkout test
git merge master

# do some work on my branch
echo "test settings 2" > settings.gradle
git commit -a -m "test settings 2"

# pride update blows up
cd ..
pride update

[lptr]

Thanks, I'll look into this soon.