(02-20-2023, 05:51 PM)kenjis Wrote: @b126 You need to merge "tatter/patches" branch, not "tatter/scratch".
Unfortunately, I only see my master branch + the new tatter/scratch
Is there a command to discover the tatter/patches branch?
For info, I got no error when launching the patch command.
Here below is an extract :
Code:
C:\wamp64\www\appgroup2>c:\wamp64\www\appgroup2\vendor\bin\patch
git version 2.39.2.windows.1
Composer version 2.5.2 2023-02-04 14:33:22
************************************
* CONFIGURATION *
************************************
Scripts Directory: c:\wamp64\www\appgroup2\vendor\bin\/../tatter/patches/src
Project Directory: /c/wamp64/www/appgroup2
Target Version:
Current Version:
Source Package: codeigniter4/framework
Base Branch: master
Selected Items: app/ public/ env spark
************************************
* STAGING *
************************************
Switched to a new branch 'tatter/scratch'
warning: in the working copy of 'app/.htaccess', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'app/Common.php', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'app/Config/App.php', LF will be replaced by CRLF the next time Git touches it
...
...
warning: in the working copy of 'spark', LF will be replaced by CRLF the next time Git touches it
Loading composer repositories with package information
Updating dependencies
Nothing to modify in lock file
Installing dependencies from lock file (including require-dev)
Nothing to install, update or remove
Generating autoload files
44 packages you are using are looking for funding.
Use the `composer fund` command to find out more!
No security vulnerability advisories found
warning: in the working copy of 'app/.htaccess', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'app/Common.php', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'app/Config/App.php', LF will be replaced by CRLF the next time Git touches it
...
...
warning: in the working copy of 'spark', LF will be replaced by CRLF the next time Git touches it
On branch tatter/scratch
Untracked files:
(use "git add <file>..." to include in what will be committed)
composer.json
composer.lock
nothing added to commit but untracked files present (use "git add" to track)
And this is what I have with a git branch
Code:
C:\wamp64\www\appgroup2> git branch
* master
tatter/scratch
