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
