Regex is one of the things that I’ve always regret I didn’t learn earlier. Yes it’s complicated, but without a doubt it is worth it. There is one syntax I didn’t know yet. The lookahead
Match everything until you find the letter a. The a itself is not included. Should be handy to parse url’s and such
On older versions (below 1.5 I think) it will only show an update is available, not to which number it will update.
And it’s quite simple
sanitize_file_name( 'R@ndom Fi(l)e?!.txt' ) will become
Official documentation sanitize_file_name
So I made a booboo and already pushed a merge commit.
The merged branch had a few commits that where not ready for develop.
After reverting the merge one commit needed to be reapplied.
But a merge wont work, because it already is merged (and reverted).
What you can do is a cherry pick.
How I created the problem
git merge branch
git push origin develop
Here there was no way back, accept rebasing but that’s still out of my comfort zone (update dec-2019: still is).
How I solved it.
git revert eaf8c471 -m2
git cherry-pick fa9a6b0
Cherry pick just straight up applies the changes made in the files.
Where a merge applies the git changes.
Keep in mind this will only help if you need a handful of commits reapplied. Otherwise you will need to find an other way.
Or cherry pick a lot…