I've pushed a rebased version to anj/modelmatrix What I did was to edit formula.jl and then
git add src/statsmodels/formula.jl git rebase --continue On Tue, Jul 19, 2016 at 1:45 PM, Douglas Bates <[email protected]> wrote: > Could someone who is able to use git tell me how I should rebase the > db/modelmatrix branch to incorporate the changes in master from the last > commit? According to the manual it is exceedingly simple, I just check out > the db/modelmatrix branch and run > > bates@thin206:~/.julia/v0.5/DataFramesā« git rebase master > First, rewinding head to replay your work on top of it... > Applying: Refactor ModelMatrix - still pending contrast changes > Using index info to reconstruct a base tree... > M src/statsmodels/formula.jl > Falling back to patching base and 3-way merge... > Auto-merging src/statsmodels/formula.jl > CONFLICT (content): Merge conflict in src/statsmodels/formula.jl > error: Failed to merge in the changes. > Patch failed at 0001 Refactor ModelMatrix - still pending contrast changes > The copy of the patch that failed is found in: .git/rebase-apply/patch > > When you have resolved this problem, run "git rebase --continue". > If you prefer to skip this patch, run "git rebase --skip" instead. > To check out the original branch and stop rebasing, run "git rebase > --abort". > > > Other than losing all the changes that I made and leaving me in a state > that, in my experience, it is impossible to recover from, that worked > well. Is there any hope of my being able to recover > > -- > You received this message because you are subscribed to the Google Groups > "julia-stats" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to [email protected]. > For more options, visit https://groups.google.com/d/optout. > -- You received this message because you are subscribed to the Google Groups "julia-stats" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
