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

Dataflow.pod: minor correction to text and added tags #531

Merged
merged 1 commit into from
Feb 14, 2025

Conversation

duffee
Copy link
Contributor

@duffee duffee commented Jan 28, 2025

Added POD code tags to some bare variables in text, e.g. from $y to $y

@duffee
Copy link
Contributor Author

duffee commented Jan 28, 2025

Is this the PR with the merge commit in it? I can't see it from git log --oneline. My git log has

6fe7c33e (HEAD -> POD-Dataflow, origin/POD-Dataflow) Dataflow.pod: minor correction to text and added tags
a47768e8 (upstream/master, origin/master, origin/HEAD, master) Core.pm: Fix POD heading for update_data_from
07b425bc give full prototype for y0,y1,log in Math/yn.c - #528
cf1a6d64 note do_print in PDL::MATLAB
1ce5f5e5 reproducible pp_line_number
42310056 (tag: 2.099) 2.099
41e28a39 automatically generate lvalue usage portion of doc
a42733e4 add Math::c{log,acos,asin,acosh,atanh} - fix #527
47194900 move csqrt* to Math - #527
81a68832 add Core::tocomplex - #527

If it is, I'll close this and re-open with a properly rebased branch.

@mohawk2
Copy link
Member

mohawk2 commented Jan 29, 2025

Are you saying you think I commented about a merge commit on the wrong PR?

Also, are you saying your approach to a PR-ed branch having the wrong contents is to close the PR and open a different one? (rather than fixing it and force-pushing)

@coveralls
Copy link

Coverage Status

coverage: 67.081%. remained the same
when pulling 6fe7c33 on duffee:POD-Dataflow
into a47768e on PDLPorters:master.

@duffee
Copy link
Contributor Author

duffee commented Jan 29, 2025

Are you saying you think I commented about a merge commit on the wrong PR?

I didn't get the merge commit comment on the benchmark PR, because I thought I'd been a good little boy whereas this PR started 18 commits later and I might have slipped up here instead. Now thinking about it, I may have hit the Github Sync Fork button which looks like it merge commits rather than rebases.

Also, are you saying your approach to a PR-ed branch having the wrong contents is to close the PR and open a different one? (rather than fixing it and force-pushing)

That's the documented procedure

I'm still trying to undo 4 years of merge commit muscle-memory, but I think I've finally got the pull from upstream, rebase and force-push loop in my head.

@mohawk2 mohawk2 merged commit 6176a4e into PDLPorters:master Feb 14, 2025
83 checks passed
@duffee duffee deleted the POD-Dataflow branch February 16, 2025 17:04
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