Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

perf: bump datavzrd wrapper to 2.6.0 and general bug fixes #79

Closed
wants to merge 159 commits into from

Conversation

manuelphilip
Copy link
Collaborator

No description provided.

johanneskoester and others added 30 commits June 2, 2022 12:05
Added heatmap and QC plot to report.html
Co-authored-by: Johannes Köster <johannes.koester@tu-dortmund.de>
Co-authored-by: Johannes Köster <johannes.koester@tu-dortmund.de>
Co-authored-by: Johannes Köster <johannes.koester@tu-dortmund.de>
Co-authored-by: Johannes Köster <johannes.koester@tu-dortmund.de>
@manuelphilip manuelphilip changed the title perf bump datavzrd wrapper to 2.6.0 and general bug fixes perf: bump datavzrd wrapper to 2.6.0 and general bug fixes Aug 28, 2023
Copy link
Collaborator

@dlaehnemann dlaehnemann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are a lot of commits in this pull request that have changes that have long been introduced into the main branch. Could you try to identify the commits with the changes that are actually displayed when you look at the Files changes tab here on the pull request and then cherry-pick those onto a new branch that you start from the main branch? So something like:

git checkout main
git checkout -b datavzrd-2-6-0-and-plot-dimensions
git cherry-pick <commit-hash-1> <commit-hash-2> <commit-hash-3>
git push -u origin datavzrd-2-6-0-and-plot-dimensions

Then, the new PR will be much cleaner to merge. Let me know if I can help with anything along the way.

@manuelphilip
Copy link
Collaborator Author

manuelphilip commented Aug 31, 2023

Hi @dlaehnemann , I am confused about where and how to find <commit-hash-1> properly. Can you please assist me with the exact location to get this <commit-hash-1>?

@dlaehnemann
Copy link
Collaborator

You can either find those right here on GitHub, by clicking on a particular commit. So I for example expect that the commit perf bump datavzrd wrapper to 2.6.0 and general bug fixes is one that belongs into this pull request. You can simply click on its link above, and then you should see the changes it introduces on a separate page. There, at the top right, you'll find commit bd964f73ab69487921766290faf9674958ae1c58. The letters and numbers are the commit's hash value.

Alternatively, you can find the commits locally on any machine where you have the repository cloned and the branch 3-prime-rna checked out. You can then issue git log on the command line and will get a browsable list of all the commits. And each commit again start with an entry of something like commit bd964f73ab69487921766290faf9674958ae1c58.

So you just go through the list of commits here, and find all the hashes like bd964f73ab69487921766290faf9674958ae1c58 for the commits that really introduce the changes of this pull request. And in the future, it is usually a good idea to start a new branch for any new pull request, especially if the original branch (like the 3-prime-rna branch here) has already been merged. This keeps the commit history and pull requests much cleaner.

@manuelphilip
Copy link
Collaborator Author

I understand it now. Thank you @dlaehnemann for the detailed explanation. It really helped. I have created a new pull request with the latest changes mentioned here. Shall I remove this pull request as this might create confusion with the new one that I created?

@dlaehnemann
Copy link
Collaborator

With the new pull request, we can cross-reference this pull request here. So this should be pull request #80 , right?
With this mention, this old pull request over here gets mentioned in the new one, as well.

And as you probably don't need this branch here, any more, but will instead create new branches off of the main branch for any future changes, you could go and Delete branch. You will still have the branch locally, where you developed it, but the repository here will stay cleaner and saner.

@manuelphilip
Copy link
Collaborator Author

Noted it.

@manuelphilip manuelphilip deleted the 3-prime-rna branch September 1, 2023 08:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants