search

mparker2 / mparker_phd_thesis

PhD Thesis
0 stars 0 forks source link

Chapter 6 #7

Closed IanSudbery closed 5 years ago

IanSudbery commented 5 years ago

Hi Mat,

Can't work out if for Chapter 6 my edits have been lost, or you've decided to reject all of them. The chapter 6 branch doesn't contain any of the changes I thought I'd made. Can you confirm that you saw them and rejected them, rather than something weird has happened.

For example I corrected "intronice" to "intronic" in

Exitrons are intronice regions which more closely resemble exonic sequence in their GC content, are multiples of three in length and do not contain in-frame stop codons

IanSudbery commented 5 years ago

This appears to have happened after your commits labelled "weird shit with stackedit". You want me to send you a patch with the in text edits?

mparker2 commented 5 years ago

yeah something strange happened where stackedit made a duplicate of the chapter_6 folder named Chapter_6. I didn't realise for a while and the two folders started to diverge because Chapter_6 contained all the stackedit changes and chapter_6 had all the changes I made locally. I made a bit of a hash of trying to merge them, sorry.

mparker2 commented 5 years ago

I don't know what the best way to fix this is. I will try and work out what edits are missing.

IanSudbery commented 5 years ago

I've merged the edits back in. I can push that commit to you if you like?

On Sun, 16 Sep 2018, 4:06 pm Matthew Parker, notifications@github.com wrote:

I don't know what the best way to fix this is. I will try and work out what edits are missing.

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/mparker2/mparker_phd_thesis/issues/7#issuecomment-421770872, or mute the thread https://github.com/notifications/unsubscribe-auth/AFJFjgEcX_SSgNYcaPqd5Epk3BUK5Tr6ks5ublrggaJpZM4Wqvt6 .

mparker2 commented 5 years ago

yes please