-
Notifications
You must be signed in to change notification settings - Fork 189
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
Quaternion formalism comments and docs #3392
Quaternion formalism comments and docs #3392
Conversation
Codecov Report
@@ Coverage Diff @@
## python #3392 +/- ##
=======================================
+ Coverage 86% 86% +<1%
=======================================
Files 538 538
Lines 25306 25306
=======================================
+ Hits 21828 21830 +2
+ Misses 3478 3476 -2
Continue to review full report at Codecov.
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The failed CI jobs have been restarted, it was a runner issue on our side. Sorry for the inconvenience.
The first 10 merge commits don't seem to add history and make the git graph more difficult to read. What would you think of rebasing the branch to have ee4232f after the last commit in the python branch?
Beside the proposed changes, this PR looks good to me.
in general, I agree. However, these merge commits are distributed over the whole 2019th year. Hence, they do not confuse the history graph so much (they are not a continuous sequence) and, also, I'm not sure how to rebase this safely (I've tried and have some suspicious feeling, maybe you could advise the safe commands). Nevertheless, I agree, next time I will not create new branches from my main branch, rather I will checkout directly from the Es. base. Also, I will merge updates using the --ff-only in case of conflicts absence. Hence, this will remove such commits further. |
The issue with merge commits is they prevent me from cherry-picking your branch into the 4.1.3 branch. When this happens, I need to manually inspect the graph to see which commits belong to your branch vs. which commits come from elsewhere to craft a valid sequence of
The canonical way is to use the 3-commit git checkout quat-formalism-comments
# rebase commit range
git rebase --onto upstream/python ee4232f0b4c^ HEAD
# we are now in a detached HEAD, we'll store it in a new branch
git branch quat-formalism-comments-rebased
git checkout quat-formalism-comments-rebased
# optional: squash the 3 peer-review commits
git reset --soft HEAD~2
git commit --amend -m 'Apply code review feedback
Co-Authored-By: Jean-Noël Grad <[email protected]>'
# push force
git push -u -f origin quat-formalism-comments-rebased:quat-formalism-comments This can also be achieved with a cherry-picking with git v1.7+: git checkout -b quat-formalism-comments-rebased upstream/python
git cherry-pick ee4232f0b4c^..quat-formalism-comments
# optional: squash the 3 peer-review commits
git reset --soft HEAD~2
git commit --amend -m 'Apply code review feedback
Co-Authored-By: Jean-Noël Grad <[email protected]>'
# push force
git push -u -f origin quat-formalism-comments-rebased:quat-formalism-comments I can do it for you if you want. The squashing makes the code review history shorter. GitHub provides the |
Co-Authored-By: Jean-Noël Grad <[email protected]>
40b5436
to
427a5cd
Compare
Hi @jngrad , thanks for the best practices sharing! It's useful. |
Fixes #2964
Description of changes:
PR Checklist