Re: [Tiki-devel] Git problem re cypht files
Victor Emanouilov via TikiWiki-devel <[email protected]>
| Newsgroups | gmane.comp.cms.tiki.devel |
|---|---|
| Message-ID | <[email protected]> |
Hi Gary, Can you please send me the output of `git diff` when you see this error? I suppose you switch between branches, do composer install which overrides these files and when you switch back to another branch you end up with mixed versions. Another reason might be if you are in 23.x, for example, and do `git pull origin master` - this will try to apply master branch commits to 23.x which is almost surely not want you want to do. In theory, we can gitignore these files but then, people checking out will need to make sure they run composer to generate the files which they probably already do. These asset files are not strictly vendor files - they are a mix of vendor and Tiki styles/code for the Cypht integration. However, since they are automatically generated, we can simply stop treating them as source code and remove them from the repo. Can someone think of a case when composer install is not run upon a deployment? I think release process also runs that command. Regards, Victor On 11/28/21 3:26 PM, Jonny Bradley via TikiWiki-devel wrote: > I believe these files are in the wrong place, they should be in vendor_bundled but i think there were path issues which meant that wasn't possible... but can't remember why - Victor, any ideas? This does cause disruption when running updates via a cron job sometimes. > > jonny > > > >> On 28 Nov 2021, at 06:46, Bernard Sfez via TikiWiki-devel <[email protected]> wrote: >> >> Hello Gary, >> >> In case you didn’t worked on those files. >> >> It happens to me too from time to time. >> I follow the message instructions to fix, overwriting my local version of those files with the repo files. >> >> (I think "git checkout …” and the file name - but double check) >> https://stackoverflow.com/questions/15296473/what-do-git-checkouts-really-mean >> >> Bernard >> >>> On 27 Nov 2021, at 16:41, Gary Cunningham-Lee <[email protected]> wrote: >>> >>> Hi, >>> >>> When I do a git pull origin master, it fails, with this error: >>> >>>> error: Your local changes to the following files would be overwritten by merge: >>>> lib/cypht/site.css >>>> lib/cypht/site.js >>>> Please commit your changes or stash them before you merge. >>>> Aborting >>> I never touch those files so I wonder why git thinks I've changed them. Seems like these have been a problem . Do these cause a problem for other people, Can I ask what commands others use to update their local git check-outs? >>> >>> Thanks, >>> >>> Gary >>> >>> >>> >>> >>> _______________________________________________ >>> TikiWiki-devel mailing list >>> [email protected] >>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel >> _______________________________________________ >> TikiWiki-devel mailing list >> [email protected] >> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel > > > _______________________________________________ > TikiWiki-devel mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel _______________________________________________ TikiWiki-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel