I put together this little script to show what I'm seeing.
The comments pretty much say what's going on. But in summary, how can I
get the merge conflict to go away? I'm surprised that the
add+commit+rebase --continue isn't enough to deal with that file.
#!/bin/bash
set -eux
set -o pipefail
if [ -f vars ]
then
# This just sets repo_name, my_url and upstream_url to real life values.
source ./vars
else
repo_name='example-repo-name'
my_url="[email protected]:dstromberg/$repo_name.git"
upstream_url="[email protected]:shared/$repo_name.git"
fi
rm -rf "$repo_name"
git clone "$my_url" "$repo_name"
cd "$repo_name"
git config --add checkout.defaultRemote origin
git remote add upstream "$upstream_url"
git checkout develop # already there, actually.
git fetch upstream
# This consistently gives a conflict in docker/requirements.txt.m4
git rebase upstream/develop develop || true
cp /tmp/requirements.txt.m4 docker/. # Normally I'd edit this to fix the
conflicts, but that got old quick :)
git add docker/requirements.txt.m4
git commit -m 'Dealt with merge conflicts' docker/requirements.txt.m4
# This also consistently gives the same conflict again in
docker/requirements.txt.m4
git rebase --continue
# We never get to this point, because of the set -e
git push --force origin develop
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/git-users/cd162e79-4da2-4679-b6a3-c9359b77f588n%40googlegroups.com.
