Re: Need help merging unrelated histories

2019-05-29 Thread Philip Oakley
Hi Robert, A few comments to look at, which may help. On 28/05/2019 19:26, Robert Dailey wrote: On Tue, May 28, 2019 at 8:35 AM Robert Dailey wrote: On Fri, May 24, 2019 at 12:11 PM Andreas Schwab wrote: On Mai 24 2019, Robert Dailey wrote: Can anyone provide some advice on how to properly

Re: Need help merging unrelated histories

2019-05-28 Thread Robert Dailey
On Tue, May 28, 2019 at 8:35 AM Robert Dailey wrote: > > On Fri, May 24, 2019 at 12:11 PM Andreas Schwab wrote: > > > > On Mai 24 2019, Robert Dailey wrote: > > > > > Can anyone provide some advice on how to properly restructure this > > > repository to create some ancestry, as if all along a `m

Re: Need help merging unrelated histories

2019-05-28 Thread Robert Dailey
On Fri, May 24, 2019 at 12:11 PM Andreas Schwab wrote: > > On Mai 24 2019, Robert Dailey wrote: > > > Can anyone provide some advice on how to properly restructure this > > repository to create some ancestry, as if all along a `master` existed > > and all release branches were based on this in a

Re: Need help merging unrelated histories

2019-05-24 Thread Andreas Schwab
On Mai 24 2019, Robert Dailey wrote: > Can anyone provide some advice on how to properly restructure this > repository to create some ancestry, as if all along a `master` existed > and all release branches were based on this in a linear fashion? How about using git replace --graft, then git filt

Re: Need help merging unrelated histories

2019-05-24 Thread Ævar Arnfjörð Bjarmason
On Fri, May 24 2019, Robert Dailey wrote: > Everything I'm going to describe is related to this repository: > > https://github.com/powervr-graphics/Native_SDK > > This repo has several distinct branches. None of them seem to be tied > to each other. Instead of having a `master` where they branch

Re: Need help merging unrelated histories

2019-05-24 Thread Robert Dailey
On Fri, May 24, 2019 at 9:04 AM Robert Dailey wrote: > > Everything I'm going to describe is related to this repository: > > https://github.com/powervr-graphics/Native_SDK > > This repo has several distinct branches. None of them seem to be tied > to each other. Instead of having a `master` where

Need help merging unrelated histories

2019-05-24 Thread Robert Dailey
Everything I'm going to describe is related to this repository: https://github.com/powervr-graphics/Native_SDK This repo has several distinct branches. None of them seem to be tied to each other. Instead of having a `master` where they branched off each of their releases (e.g. 3.1, 3.2, 4.0), it