On Thu, 16 Apr 2020 12:30:20 GMT, Kevin Rushforth <k...@openjdk.org> wrote:
>> Seems I've made a further mess attempting to rebase. I apologize as I know >> the list is not intended to be tech support for git usage, but I'm at a >> loss and don't want to make it worse. >> >> Below is the log after an interactive rebase and forced push. >> >> "" >> Merge branch '8129123' of https://github.com/ccavanaugh/jfx into 8129123 >> >> branches 8129123, origin/8129123 >> "" >> >> Thanks, >> Craig >> >> On Tue, Apr 14, 2020 at 7:11 AM Kevin Rushforth <notificati...@github.com> >> wrote: >> >>> I think you will need to rebase and force push your branch. >>> >>> — >>> You are receiving this because you were mentioned. >>> Reply to this email directly, view it on GitHub >>> <https://github.com/openjdk/jfx/pull/166#issuecomment-613378384>, or >>> unsubscribe >>> <https://github.com/notifications/unsubscribe-auth/AAE3QIRVUG2DTSQ7H7BFJT3RMRAGBANCNFSM4MES2KIA> >>> . >>> > > The following should work: > > $ git rebase -i master > > If the rebase is successful, it will pop you into your EDITOR. You then > select "pick" for the first commit (which is > already selected by default) and "s"quash or "f"ixup for all subsequent > commits. Then, if it looks good to you, do the > following: $ git push --force origin 8129123 That did it! Thanks! On Thu, Apr 16, 2020 at 8:30 AM Kevin Rushforth <notificati...@github.com> wrote: > The following should work: > > $ git rebase -i master > > If the rebase is successful, it will pop you into your EDITOR. You then > select "pick" for the first commit (which is already selected by default) > and "s"quash or "f"ixup for all subsequent commits. Then, if it looks good > to you, do the following: > > $ git push --force origin 8129123 > > — > You are receiving this because you were mentioned. > Reply to this email directly, view it on GitHub > <https://github.com/openjdk/jfx/pull/166#issuecomment-614622433>, or > unsubscribe > <https://github.com/notifications/unsubscribe-auth/AAE3QIRSLJFPKYG2F7B4VO3RM326XANCNFSM4MES2KIA> > . > ------------- PR: https://git.openjdk.java.net/jfx/pull/166
