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

Fix wrong parameter in get_part_resources() #1835

Closed
wants to merge 4 commits into from

Conversation

MidsummerNight
Copy link
Contributor

The assertion error for get_part_resources() should print res_mapping instead of part_mapping (the latter isn't even defined in get_part_resources()). See #1834 for details.

@acomodi
Copy link
Contributor

acomodi commented Jan 27, 2022

@MidsummerNight Thanks for this fix!

There is the DCO check failing (https://stackoverflow.com/questions/25570947/how-to-use-git-interactive-rebase-for-signing-off-a-series-of-commits).

On an additional note the usual workflow is to:

  • create a new branch starting from the upstream master one
  • from the branch open the PR
  • if any update lands on upstream master, rebase the branch on top of it
Stack Overflow
I would like to sign off all commits on a branch that I have finished and want to send to an upstream project (e.g. via a pull request on GitHub).

A recommended way I've found is to use

git rebas...

@acomodi
Copy link
Contributor

acomodi commented Jan 27, 2022

@MidsummerNight Sign off should be applied to all commits in the PR. Actually I think you could squash all of them into a single commit (https://stackoverflow.com/questions/5189560/squash-my-last-x-commits-together-using-git)

Stack Overflow
How can I squash my last X commits together into one commit using Git?

mithro and others added 4 commits January 27, 2022 21:26
Signed-off-by: Tim 'mithro' Ansell <[email protected]>
Signed-off-by: Steve <[email protected]>
The assertion error for `get_part_resources()` should print `res_mapping` instead of `part_mapping` (the latter isn't even defined in `get_part_resources()`)

Signed-off-by: Steve <[email protected]>
Signed-off-by: Steve <[email protected]>
@MidsummerNight
Copy link
Contributor Author

Ugh somehow Tim's Kintex commit got inside......

@MidsummerNight
Copy link
Contributor Author

I ran gh pr checkout 1835, then git rebase HEAD~5 --signoff followed by git push --force-with-lease origin master as the DCO check page told me. Maybe I should've used HEAD~4 instead of 5...

@acomodi
Copy link
Contributor

acomodi commented Jan 27, 2022

I think you may create a new branch from the current HEAD, commit your change with the sign-off and open a new PR

@MidsummerNight
Copy link
Contributor Author

Yeah that would be a better way. Will do more research on Git and create a new PR tomorrow.

@MidsummerNight
Copy link
Contributor Author

Filed #1836 with correct sign-off to replace this one. I'll make sure to always sign off properly in future PRs.

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