New _extras lesson on sequence alignments #162
Conversation
Update sequence_alignment
Create sequence_alignment
Update sequence_alignment.md
Update sequence_alignment.md - combined commits Update sequence_alignment.md Update sequence_alignment.md
|
Hi Sarah,
Did you all have a coding marathon yesterday on this... that I missed?
I am replying by email because I cannot find this specific conversation on gihtub.
I did reply on GitHub to 2 comments you made about adding a DOI and some italic text. Both are resolved (as not change required.)
For "Squashing" comments myself the only way I was able to do it was by using GitHub-Desktop.
But then the only way to "push" back to GitHub is to "force push" that give me this warning:
A force push will rewrite on origin/jys-docker-pages. Any collaborators working on this branch will need to reset their own local branch to match the history of the remote
In theory I am the only one working on this branch... so it would be OK.
It's been many months that I worked on this, and I find it difficult to get back in and relearn GitHub again, and it is difficult to get back in the train of thoughts to make more modifications.
Just trying to be consciously helpful! and not mess things up.
Thanks for your help!
Jean-Yves
|
…troduction into jys-docker-pages
|
Hello Sarah and A Turner. I think that I was able to squash some of the commits (by Github Desktop - I don't have Tower.) Unable to squash. Squashing replays all commits up to the last one required for the squash. A merge commit cannot exist among those commits. At this point, since it's been 4 months, I am completely lost as I have not use Git or GitHub since then... JYS P.S. Also for the minor edits from yesterday by Sarah, I don't have write permission feel free to "press the button" to implement them as I cannot... |
|
I’m not sure you saw all of my inline comments, so you might want to look there before you push the squashed changes. I attended a lesson development co-working session and spent some time reviewing this PR. I’m trying to get some issues settled so we can send this lesson through a formal peer review process. I think you should be okay to overwrite the branch once you’ve made the changes I suggested inline. I was working only in the GitHub web interface. I’ll re-review your changes (when I have time) once you’ve pushed the squashed branch. |
Made multiple changes suggested in "New _extras lesson on sequence alignments carpentries-incubator#162" pull request carpentries-incubator#3.
|
I have implemented the change suggestions that were added yesterday. For all except a couple of them the suggestion was implemented exactly as suggested and the conversation marked as "resovled." About the request to change the ZIP file, and the various content name and directories, I am not sure I understand exactly what is requested. Furthermore, this was done 4 months ago, and I am afraid that changing the file and folders name or location will need more editing... And after 4 months I am not sure that I can do that without adding more mistakes. |
back rename file without `e03-` temporarily with hope that I can now "squash" the many previous commits with the old name. Will rename back after test.
|
Hi @jsgro. I'll try to go through the current PR soon but can clarify the zip file suggestion a bit more here. I'm suggesting we decouple the files for this exercise from the files for the main part of the lesson. I think it will be useful since this is an optional example that will only be used when the instructor wants to use a genomics example. This means that you would remove the changed |
REnamed again. Impossible to get rid of old commits by squashing. I also tried the `git` commandline, but nothing good happened. So I give up on that.
|
I have done this as suggested by Sarah: This means that you would remove the changed Thanks Sarah, that was very helpful. I also added the entry in |
Added Sequence Alignment Examples paragraph as requested.
I changed the name of my cloned version from
gh-pagestojys-docker-pageswhich automatically closed my previous pull request. I made more revisions to the filesequence_alignment.mdand added sequences and directories to thedocker-introdirectory, also added the same within thefiles/docker-intro.zipfile.Pairwise alignment exercises were derived from Docker – Beginner Biologist 3.
Multiple sequence alignment exercises were derived from SARS-CoV-2-Spike-alignment.