| # |
Dec 31st 2019, 20:05 |
 ricksaccous |
happy new YEAR |
| # |
Dec 31st 2019, 19:54 |
maymeow |
Happy New Year everyone :tada::sparkler::fireworks: |
| # |
Dec 31st 2019, 19:25 |
brian.french |
Also, cakephp/codeception is on the codeception/codeception 2.x branch, and their current branch is 4.x, almost seems worth dropping the project, unless it truly adds value. |
| # |
Dec 31st 2019, 19:24 |
brian.french |
@admad Yet, im my many instances, it doesn't seem to be installed. Including my fork of cakephp/app. |
| # |
Dec 31st 2019, 19:18 |
ricksaccous |
paste images i mean |
| # |
Dec 31st 2019, 19:17 |
ricksaccous |
weeeeee |
| # |
Dec 31st 2019, 19:17 |
ricksaccous |
how many of ur clients want wysiwyg editors where they can just paste from clipboard in? |
| # |
Dec 31st 2019, 18:41 |
admad |
Conditionally, which i am aware of |
| # |
Dec 31st 2019, 17:41 |
brian.french |
@admad It's being used in the app skeleton. https://github.com/cakephp/app/blob/master/src/Console/Installer.php#L66 |
| # |
Dec 31st 2019, 15:19 |
birdy247 |
but want to get master back to the state before I started work |
| # |
Dec 31st 2019, 15:19 |
birdy247 |
I just made a new branch which the changes I want to keep |
| # |
Dec 31st 2019, 15:19 |
birdy247 |
assuming I have already pushed |
| # |
Dec 31st 2019, 15:19 |
birdy247 |
@dereuromark can I revert to a specific commit and then push this to master |
| # |
Dec 31st 2019, 15:09 |
birdy247 |
when they were always in master |
| # |
Dec 31st 2019, 15:09 |
birdy247 |
What I dont get, in the merge commite, its saying that files have been added |
| # |
Dec 31st 2019, 15:09 |
birdy247 |
presumably, the fit pull should sort itself out |
| # |
Dec 31st 2019, 15:08 |
birdy247 |
and pushed |
| # |
Dec 31st 2019, 15:08 |
birdy247 |
new commit |
| # |
Dec 31st 2019, 15:08 |
birdy247 |
and I fixed conflicts |
| # |
Dec 31st 2019, 15:08 |
birdy247 |
Then loads of files were updated |
| # |
Dec 31st 2019, 15:08 |
birdy247 |
so I did |
| # |
Dec 31st 2019, 15:08 |
birdy247 |
then it said I needed to do a git pull |
| # |
Dec 31st 2019, 15:08 |
birdy247 |
commited and went to push |
| # |
Dec 31st 2019, 15:08 |
birdy247 |
I then made my changes |
| # |
Dec 31st 2019, 15:07 |
birdy247 |
My compiter had master from 2018-02-01 |
| # |
Dec 31st 2019, 15:07 |
dereuromark |
when I did a commit too early, and want to restash, i use https://www.git-tower.com/learn/git/faq/undo-last-commit |
| # |
Dec 31st 2019, 15:06 |
slackebot |
<birdy247> |
| # |
Dec 31st 2019, 15:05 |
slackebot |
<birdy247> |
| # |
Dec 31st 2019, 15:03 |
dereuromark |
how, if you had a new commit there? only force would push |
| # |
Dec 31st 2019, 15:03 |
birdy247 |
or reset to the commit before the merge? |
| # |
Dec 31st 2019, 15:02 |
birdy247 |
I have already pushed though |
| # |
Dec 31st 2019, 15:02 |
dereuromark |
it would be easier to just reset your local commit and stash the changes, then pull, then reapply stash |
| # |
Dec 31st 2019, 15:02 |
birdy247 |
now my merge shows about 1000 files changed |
| # |
Dec 31st 2019, 15:02 |
birdy247 |
I then did a git pull and fixed any conflicts |
| # |
Dec 31st 2019, 15:01 |
birdy247 |
I had actually started my changes from a version of master about 100 commits behind master |
| # |
Dec 31st 2019, 15:01 |
birdy247 |
made loads of chnages and just gone to push |
| # |
Dec 31st 2019, 15:01 |
birdy247 |
hadnt done a git pull |
| # |
Dec 31st 2019, 15:01 |
birdy247 |
started working on a new feature from a project |
| # |
Dec 31st 2019, 15:01 |
birdy247 |
I just did a really dumb thing |
| # |
Dec 31st 2019, 14:00 |
tibor.hajos |
https://github.com/cakephp/cakephp/pull/14106 I hope I understood everything well enough. Any feedback is welcome, I'll do my best to apply fixes accordingly. |
| # |
Dec 31st 2019, 11:05 |
admad |
@brian.french we are looking for contributors, we have no one on the team who uses it to maintaining it is proving difficult |