search

broadinstitute / 2022_PERISCOPE

This repository contains all supporting analyses and files for Ramezani, Bauman, Singh, and Weisbart, et al. "A genome-wide atlas of human cell morphology".
BSD 3-Clause "New" or "Revised" License
2 stars 0 forks source link

Minor updates #19

Closed MerajRamezani closed 1 year ago

MerajRamezani commented 1 year ago

@ErinWeisbart some updates as I mentioned, something has gone wrong here?

ErinWeisbart commented 1 year ago

Merge conflicts can happen if you have made changes to the not-most-recent version of files. If you have a change in the same place as a change that has already been committed to the repo, the conflict has to be resolved which is what this is telling us.

Always performing a git pull before editing files can help with this, though if you've been working on changes for a while it may be inevitable.

That being said, I tried to go fix the merge conflicts and neither Figure_2.ipynb or Figure_3.ipynb that you have uploaded will open for me. Can you check how you have saved the files and that they will open?

MerajRamezani commented 1 year ago

I am trying GH desktop to understand it better but I still don’t know what is going on. You are probably right about the cause but how can it be fixed? The files look like normal on my system but hard to understand using GH desktop(But that seems to be the case with all .ipynb diff files).