search

h3abionet / H3ABionet-SOPs

Standard operating procedures for H3ABionet data processing and analyses
https://h3abionet.github.io/H3ABionet-SOPs/
10 stars 21 forks source link

Update GWAS.md #15

Open saraeljad opened 4 years ago

saraeljad commented 4 years ago

Spelling, grammar, checking links and references

cjfields commented 4 years ago

Hi @saraeljad can you check your edits in context with pull request #13? If needed I can merge that one in, but I'm sure it will conflict with yours (and vice versa).

saraeljad commented 4 years ago

Hi @cjfields, thanks for pointing this. I have checked the pull request #13 , there are some differences. I think you can try to merge both to complement the edits.

cjfields commented 4 years ago

@saraeljad okay I'll try #13 first then this one.

cjfields commented 4 years ago

@saraeljad there are some conflicts. Does the conflict resolution button show up for you (below)?

image

If so it might be easier to use than trying to pull everything locally and making changes.

A few of these are simple differences in grammar (data is vs data are) which are controversial, I'm okay with either to be honest.

cjfields commented 3 years ago

H @saraeljad I'll have a look at these to see if I can get them merged in prior to the next workflows/SOP meeting