Re: Git Unrelated Histories

From: Stefan Beller <sbeller@google.com>
Date: Aug 29, 2018, 20:13 UTC
Message-ID: <CAGZ79kZ1fcvBbJ9K+jw=wvCseSURSEKvnCDNFGsuZqcOfcZ7tQ@mail.gmail.com>
In-Reply-To: <CAE3VKErGMSgB9gJAEnAuEDE51Yem6WUsg6fmOQELY1HCrALk_Q@mail.gmail.com>

+cc the mailing list

Show 16 quoted lines

> > >
> > > git merge development_feature_branch
> > > fatal: refusing to merge unrelated histories
> > >
> >
> > See the git merge man page for the
> >   --allow-unrelated-histories switch.
>
> I have tried that switch, however when merging a small feature branch,
> the merge tries to merge ALL of the differences between both branches,
> and they have diverged quite a long while ago.
> I am not getting the expected behaviour of just merging the changes
> from the feature branch.
>
> git-merge-base shows a common ancestor from 2 months ago,  btw.
>