Closed MeirionHughes closed 2 years ago
One PR is fine with me; just keep the individual commits.
Did you have any conflicts when cherry-picking?
once I realised I needed b4085f0, there was nothing nasty:
an extra env_
needed fixing (55547fa),
hand fix the const keyword additions (8444933).
I opted to keep the entire head version of README.MD (rocksdb) as its completely different (968cfcb)
once I realised I needed b4085f0, there was nothing nasty
Good catch.
I picked them into a seperate branch and amended each with their original sha's from levelup, then forced that branch back to this PR. That okay? on the PR they're showing up but github isn't making them a link for me.
I guess it needs an actual http link... ? sigh lol. I'll do it again
They're cross-repo references, so for them to be auto-linked by GitHub, commits require the format Level/leveldown@xxx
, PRs require the format Level/leveldown#123
and yeah, HTTP URLs are good too.
You might like git's interactive rebase, allows you to edit commit messages (and more) on the same branch.
You might like git's interactive rebase, allows you to edit commit messages (and more) on the same branch.
hu... I didn't know you could do that. It shows up on tortoise git if I try to rebase the branch to an earlier point and select Force Rebase.
Well they should all have links now. hopefully...
183
@vweevers I've never actually cherry picked (in like 15 years) - this seemed to have no issues being picked and applied. So you want them all in one, or one PR at a time?