Closed fqiang closed 8 years ago
@joehuchette, now that PIPS is publicly released, could we set up travis CI here?
Since it's PIPS specific, it seems like src/pips_structure_interface.jl
should go in PIPS.jl or somewhere similar?
@joehuchette maybe put it in another folder, but I am not sure what's the best way to present this.
I really think the PIPS specific code needs to go somewhere else; this repo should only include solver-agnostic modeling code. PIPS.jl seems like the natural place to put it.
Thanks @fqiang, looks good now. I have a few small comments. Can you please address those, and then squash this down to a single commit?
@joehuchette Thanks. Just merge the commits into 35e7412. Let me know if that works.
Didn't seem to work, there are still 73 commits, and merge conflicts with master.
resolved the conflict, do you know the command to merge commits into one. or I will need to do another PR to achieve this? @joehuchette
You can use git rebase -i master
. For each commit besides the first, change pick
to f
and step through the rebase. You can just open another PR if you run into issues, though.
close this one to open a new PR.