Closed drighelli closed 3 years ago
Thanks @LiNk-NY I just realized that we had conflicts, how do I pull from your repo to mine?
Hi Dario, @drighelli
I think you'd have to do a reset --hard
to the commit previous to this pull request ec0cdac62fc4d3ade94c3e884fb085df3ad64d58 based on your log. Then you can do a pull from waldronlab/SingleCellMultiModal master. I couldn't keep your history due to the conflict, sorry!
Also, you can move these commits to another branch before the above operation to keep a record.
Hi Dario, @drighelli I merged this here a56624d107f13abcb577c550cf540f3d3633f3dd because there were conflicts. I squashed the commits and made some fixes. Thanks! Please make sure that you are pulling from the master branch and merging before you push the PR to avoid conflicts. Let me know if you need help. Best, Marcel