search

hyginn / Ontoscope

BCB420 class project to identify "identity defining" transcription factors for cell types.
4 stars 6 forks source link

Adding assess #14

Closed phil-fradkin closed 8 years ago

phil-fradkin commented 8 years ago

Assess module still have to finish figuring out Parent of Gene (Orn score)

thejmazz commented 8 years ago

There's a few conflicts from your branch with updated versions of some files:

~/r/Ontoscope$ git merge --no-ff Adding-asses
warning: Cannot merge binary files: phylify/COdat.RData (HEAD vs. Adding-asses)
Auto-merging phylify/workflow.r
CONFLICT (content): Merge conflict in phylify/workflow.r
Auto-merging phylify/COdat.RData
CONFLICT (add/add): Merge conflict in phylify/COdat.RData
Auto-merging fantom_import/fantom_main.R
CONFLICT (content): Merge conflict in fantom_import/fantom_main.R
Automatic merge failed; fix conflicts and then commit the result.

--no-ff is for no fast forward and makes a new merge commit from what I understand.

My files, and then one of @biodim's.

I am replacing them with whatever is on the latest commit on master:

git checkout HEAD -- fantom_import/fantom_main.R
git checkout HEAD -- phylify/workflow.r
git checkout HEAD -- phylify/COdat.RData

Overall, fairly clean merge :) If someone got to this earlier, I think it would have been mergeable from the web interface.

Feel free to commit directly to master from now on though.

thejmazz commented 8 years ago

@MonumentalJ I'll let you delete the branch when you're ready.

phil-fradkin commented 8 years ago

Hey Julian so what do I have to do? I just want to add asses I don't really want all the other changes

On Wed, Mar 30, 2016 at 12:42 AM, Julian Mazzitelli < notifications@github.com> wrote:

@MonumentalJ https://github.com/MonumentalJ I'll let you delete the branch when you're ready.

— You are receiving this because you were mentioned. Reply to this email directly or view it on GitHub https://github.com/hyginn/Ontoscope/pull/14#issuecomment-203246430

thejmazz commented 8 years ago

Yeah it's fine, just check if the current master has everything how you want it