merge failure because base branch not updated

[smarkets]

merge failure because base branch not updated

[glensc]

my docker image version:

# docker images
REPOSITORY                                    TAG                 IMAGE ID            CREATED             SIZE
smarketshq/marge-bot                          latest              22433019da23        47 years ago        275.9 MB

[glensc]

also i think git reset --hard master origin/master is needed if someone does force push on master branch. but i still think it's just simplier to rebase against origin/master than local master branch

default git fetch configuration will overwrite changes in origin/*

[jcpetruzza]

I'm not sure I understand if there is indeed an issue here. It is true that in the end the, repo points to (local) master and not origin/master but as I understand it that shouldn't be a problem:

Assume we start with the repo in master, which as you observe, may be different from origin/master. We then do (following the pasted log above):

1. git fetch origin, so we are still in master, but origin/master and origin/merge-request-branch are up-to date.
2. git checkout -B merge-request-branch origin/merge-request-branch --, so now the working branch is the branch to be rebased
3. git rebase origin/master, here we rebase against the remote master branch, and fail because of a merge conflict.

So up to this point, everything has been done as one would expect. The following steps are just clean-ups, aimed to leaving the repo i) in a usable state (git rebase --abort), and ii) with a minimum number of branches (git checkout master; git branch -D merge-request-branch).

So we end up in master only because it is a branch we can assume exists locally. Does this make sense?

[glensc]

ok, looking the log i pasted, indeed the rebase is done on origin/master after fetch origin. so it's behaving as i suggested. and i have no clues why the rebase failed in that scenario.

closing as i have no more information or suggestions to add.

thanks for looking into this!