| # |
Nov 5th 2019, 17:35 |
 karmicdice |
Adios! Thanks for being patient... just learning my way to contrib more to the framework in near future. :slightly_smiling_face: Learning... |
| # |
Nov 5th 2019, 17:33 |
karmicdice |
Haha! It is close to mid-night here, just wanted to be quick. |
| # |
Nov 5th 2019, 17:33 |
dereuromark |
Didnt want to Force push?^^ |
| # |
Nov 5th 2019, 17:32 |
karmicdice |
https://github.com/cakephp/cakephp/pull/13843 |
| # |
Nov 5th 2019, 17:31 |
karmicdice |
@dereuromark Yep. Took a backup and made a new PR. Discarded the previous branch. |
| # |
Nov 5th 2019, 17:30 |
karmicdice |
Yes Windows. I have PhpStorm on Windows... but setting up stuff was taking up time. |
| # |
Nov 5th 2019, 17:11 |
dereuromark |
I used to do this via Windows Tortoise Git with single clicks too back many years ago, since Linux I only use CLI these days, I might also have to check the PHPStorm GUI here (again) some day. |
| # |
Nov 5th 2019, 17:11 |
dereuromark |
@karmicdice Make sure you got a backup branch stored away just in case, then even if things go boom, you can recover and restart without having lost all the changes, once you (accidently or on purpose) then force push to upstream. |
| # |
Nov 5th 2019, 16:36 |
karmicdice |
PhpStorm. ! I have that.! Let me check |
| # |
Nov 5th 2019, 16:36 |
ndm |
Ever since PhpStorm I've never manually used the Git CLI for rebasing again :upside_down_face: |
| # |
Nov 5th 2019, 16:36 |
ndm |
Rebasing can mess up things quite easily if you're making a mistake, if you're getting 4.x stuff, then you probably rebased onto the wrong branch. |
| # |
Nov 5th 2019, 16:28 |
karmicdice |
Cool then! |
| # |
Nov 5th 2019, 16:28 |
karmicdice |
Maybe you cannot read either. |
| # |
Nov 5th 2019, 16:28 |
karmicdice |
I just mentioned it is taking up history from 4.x |
| # |
Nov 5th 2019, 16:28 |
admad |
I never said i could be |
| # |
Nov 5th 2019, 16:27 |
karmicdice |
I am not sure if you can be of any help. |
| # |
Nov 5th 2019, 16:27 |
admad |
I don't know what mess you created :slightly_smiling_face: My commits shouldn't show up in the changes i have added |
| # |
Nov 5th 2019, 16:26 |
karmicdice |
@admad Currently it is showing me a massive Mailer change which has your sig on it... Obviously, higher chances of conflicts. Any idea about how I could rebase to only 1 branch? It is taking up history from 4.x |
| # |
Nov 5th 2019, 16:25 |
hello518 |
Ahhh gross -- Thanks for the information, helpful! |
| # |
Nov 5th 2019, 16:24 |
admad |
The JsHelper would still be available in cake 1.x core |
| # |
Nov 5th 2019, 16:23 |
admad |
It was a just had php wrapper functions which spitted out js code |
| # |
Nov 5th 2019, 16:23 |
hello518 |
Do you by a chance know what it did? |
| # |
Nov 5th 2019, 16:22 |
admad |
If your app is using it better just start fresh :slightly_smiling_face: |
| # |
Nov 5th 2019, 16:22 |
hello518 |
Looks like I'll be doing some refactoring and clean up :slightly_smiling_face: |
| # |
Nov 5th 2019, 16:21 |
hello518 |
Darn, that's what I was hoping wasn't in the conclusion, haha, thanks! |
| # |
Nov 5th 2019, 16:21 |
admad |
@hello518 that's a defunct plugin which existed for a short while. There was a GitHub repo for it maybe it's gone now |
| # |
Nov 5th 2019, 16:18 |
hello518 |
Hi -- I'm new to CakePHP and can't seem to find the plugin CakeJS anywhere, does anyone know if this is like default plugin or where to find it, I've searched the almighty Google for it but can't seem to find a repo or package for it. Anyone know where I could get my hands on it? It seems to be a dependency in a project we've inherited at work. |
| # |
Nov 5th 2019, 16:15 |
karmicdice |
I reckon deleting the current and rebranching, after that sending another PR from that branch is easier? |
| # |
Nov 5th 2019, 16:11 |
karmicdice |
Is there is a better way to do things which is limited to 1 branch only? |
| # |
Nov 5th 2019, 16:11 |
karmicdice |
I am currently facing a bunch of CONFLICTS from various files I am alien to. |
| # |
Nov 5th 2019, 16:10 |
karmicdice |
how do I go about f... I was referring to an issue I was facing.. Sorry I didnt write in details... but ndm resolved it for me. First commit must be a pick. I had all as f |
| # |
Nov 5th 2019, 15:55 |
dereuromark |
This whole prefix casing for URL string, path, array is killing me ... |
| # |
Nov 5th 2019, 15:51 |
dereuromark |
I might just not make sense most of that time^^ |
| # |
Nov 5th 2019, 15:50 |
dereuromark |
"for follow up commits after the first." people are not really listenting to me today :P |
| # |
Nov 5th 2019, 15:37 |
ndm |
The first commit must be `pick` |
| # |
Nov 5th 2019, 15:33 |
karmicdice |
throws an error unable to squash without previous commit |
| # |
Nov 5th 2019, 15:33 |
karmicdice |
Is idea to squash the commits? I am trying rebase -i HEAD~38 and upon editor, replacing pick with f |
| # |
Nov 5th 2019, 15:32 |
ndm |
I don't know |
| # |
Nov 5th 2019, 15:29 |
val |
@ndm what does "pinned" tag means there? |
| # |
Nov 5th 2019, 15:19 |
ndm |
@val That's basically this issue: https://github.com/cakephp/cakephp/issues/10746 |
| # |
Nov 5th 2019, 15:18 |
jotpe |
@karmicdice Thanks, but I don't use any pngs? I didn#t had libpng installed, nothing changes if I install a recent version |