It sound like you have merged you feature branch into your private master
branch.
Is the new master working now including your "id3ratings_to_stars
<https://github.com/WaylonR/mixxx/tree/id3ratings_to_stars>" changes?
If yes, you can correct your repository like this:
# comit your merge
git commit -a
#checkout your original id3ratings_to _stars brach
git checkout id3ratings_to _stars
# create a backup branch of your work (just in case)
git checkout -b id3ratings_to _stars_backup
# switch back to the github pull request tracked branch
git checkout id3ratings_to _stars
# drop the current state and replace it with you merge results from your
private master
git rest master --hard
# publish your changes in the PR
git push
# switch to your private master
git checkout master
# fetch all upstream changes
git fetch upstream
# if this fails because "upstream" is unknown add it
git remote add upstream https://github.com/mixxxdj/mixxx.git
git fetch upstream
# replace you local master by the upstream branch
git reset upstream/master --hard
# publish your master at github
git push
you should watch every step using "gitk"
2016-12-09 0:14 GMT+01:00 Waylon Robertson <wrobertson1...@gmail.com>:
> hmm.. thought it was git add remote, git pull my remote branch, think
> it ended up in master, fix conflicts, then recompile.
> at least, thats what i just did.
>
> What did i just do?
>
>
> On Fri, Dec 9, 2016 at 12:07 PM, Daniel Schürmann <dasch...@mixxx.org>
> wrote:
> > Rebasing will work like this:
> >
> > git fetch upstream
> > git checkout id3ratings_to_stars
> > git rebase upstream/master
> >
> > resolve conflict if any
> >
> >
> >
> > Am 08.12.2016 um 23:43 schrieb Waylon Robertson:
> >> its been ages since i've done any work on mixxx, i am recompiling, I
> >> am considering just making a new branch off my new master here, and
> >> redoing the code from scratch, since it has been so long... someone
> >> said that i should rebase, though.
> >>
> >> comments? and how do i get and rebase my branch, after git cloning the
> >> mixxx.git?
> >>
> >> On Fri, Dec 9, 2016 at 11:14 AM, Be <b...@gmx.com> wrote:
> >>> AFAIK no. There is a show stopper with some FLAC files in 2.0 though,
> so
> >>> I've been using master.
> >>>
> >>> On 12/08/2016 04:11 PM, Waylon Robertson wrote:
> >>>> Any gotchas/showstoppers currently existing on the bleeding edge?
> >>>>
> >>>> ------------------------------------------------------------
> ------------------
> >>>> Developer Access Program for Intel Xeon Phi Processors
> >>>> Access to Intel Xeon Phi processor-based developer platforms.
> >>>> With one year of Intel Parallel Studio XE.
> >>>> Training and support from Colfax.
> >>>> Order your platform today.http://sdm.link/xeonphi
> >>>> _______________________________________________
> >>>> Get Mixxx, the #1 Free MP3 DJ Mixing software Today
> >>>> http://mixxx.org
> >>>>
> >>>>
> >>>> Mixxx-devel mailing list
> >>>> Mixxx-devel@lists.sourceforge.net
> >>>> https://lists.sourceforge.net/lists/listinfo/mixxx-devel
> >>>>
> >>>
> >>> ------------------------------------------------------------
> ------------------
> >>> Developer Access Program for Intel Xeon Phi Processors
> >>> Access to Intel Xeon Phi processor-based developer platforms.
> >>> With one year of Intel Parallel Studio XE.
> >>> Training and support from Colfax.
> >>> Order your platform today.http://sdm.link/xeonphi
> >>> _______________________________________________
> >>> Get Mixxx, the #1 Free MP3 DJ Mixing software Today
> >>> http://mixxx.org
> >>>
> >>>
> >>> Mixxx-devel mailing list
> >>> Mixxx-devel@lists.sourceforge.net
> >>> https://lists.sourceforge.net/lists/listinfo/mixxx-devel
> >>
> >> ------------------------------------------------------------
> ------------------
> >> Developer Access Program for Intel Xeon Phi Processors
> >> Access to Intel Xeon Phi processor-based developer platforms.
> >> With one year of Intel Parallel Studio XE.
> >> Training and support from Colfax.
> >> Order your platform today.http://sdm.link/xeonphi
> >> _______________________________________________
> >> Get Mixxx, the #1 Free MP3 DJ Mixing software Today
> >> http://mixxx.org
> >>
> >>
> >> Mixxx-devel mailing list
> >> Mixxx-devel@lists.sourceforge.net
> >> https://lists.sourceforge.net/lists/listinfo/mixxx-devel
> >>
> >
> > ------------------------------------------------------------
> ------------------
> > Developer Access Program for Intel Xeon Phi Processors
> > Access to Intel Xeon Phi processor-based developer platforms.
> > With one year of Intel Parallel Studio XE.
> > Training and support from Colfax.
> > Order your platform today.http://sdm.link/xeonphi
> > _______________________________________________
> > Get Mixxx, the #1 Free MP3 DJ Mixing software Today
> > http://mixxx.org
> >
> >
> > Mixxx-devel mailing list
> > Mixxx-devel@lists.sourceforge.net
> > https://lists.sourceforge.net/lists/listinfo/mixxx-devel
>
------------------------------------------------------------------------------
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today.http://sdm.link/xeonphi
_______________________________________________
Get Mixxx, the #1 Free MP3 DJ Mixing software Today
http://mixxx.org
Mixxx-devel mailing list
Mixxx-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mixxx-devel
