Re: [Mixxx-devel] Devel and live play on master

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 " changes? If yes, you can correct your repository like this: # comit your merge git

Re: [Mixxx-devel] Devel and live play on master

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 wrote: > Rebasing will work like this: > > git

Re: [Mixxx-devel] Devel and live play on master

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

Re: [Mixxx-devel] Devel and live play on master

Hi I have used it last weekend with no issues but than means nothing. You should take some time to verify this for your use case at home. Kind regards, Daniel Am 08.12.2016 um 23:11 schrieb Waylon Robertson: > Any gotchas/showstoppers currently existing on the bleeding edge? > >

Re: [Mixxx-devel] Devel and live play on master

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

[Mixxx-devel] Devel and live play on master

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