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

Assgn badflag #96

Closed
wants to merge 13 commits into from
Closed

Assgn badflag #96

wants to merge 13 commits into from

Conversation

hainest
Copy link

@hainest hainest commented Apr 8, 2015

Updated repo version of #51 (comment) and a little cleanup in t/ops.t.

@mohawk2
Copy link
Member

mohawk2 commented Apr 9, 2015

Tim, I assume this is good stuff. However, I'm guessing you meant to PR 1 commit, not 72. This branch has all of the "merge" stuff we already talked about as making the PR-evaluator/merge's life hard, along with a new even-larger "merge" commit: the penultimate one changes 361 files.

If you'd like to make things easier for everyone (especially you!) going forward, and use git like a pro, read on. If this is too much of a diversion from things that are more important to you, let me know and I'll pull out what I can from the PR as currently is. If you have questions about this stuff, feel free to join IRC on irc.perl.org/#pdl.

I've brought the PDLPorter repo's hainest-assgn_badflag up to date by rebasing it against current master, and force-pushed it. What I'd like you to do is make your repo's assgn_badflag branch be up to date with that, something like:

git checkout -b assgn_badflag-rebased master
git pull https://github.com/PDLPorters/PDL.git hainest-assgn_badflag # get latest rebased version
git checkout assgn_badflag
git rebase -i assgn_badflag-rebased # the -i lets you look at the list and make sure it's what you expect
# now make there be any extra commits you want
git push -f # update your copy of the branch, which will magically update the PR

Please put a comment on here when you've done this since github won't tell me when you've updated it.

@hainest
Copy link
Author

hainest commented Apr 11, 2015

Ah! No, I definitely didn't mean to submit 72 commits! I don't normally work with rebased repos, so I greatly appreciate you outlining how to use that. I have received notice that the assgn_badflag branch was merged with master, so I am assuming you took care of that. If so, thanks!

@mohawk2
Copy link
Member

mohawk2 commented Apr 12, 2015

Whatever notice you received was incorrect. It is not merged, as we are too close to a release for this kind of late change. However I am very keen for this work to be completed and for it to improve a near-future release! Once again, please action my suggestions above and fix up your work so it is of use.

@wchristian wchristian closed this Mar 1, 2018
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.

None yet

3 participants