Re: [Tiki-devel] Git problem re cypht files
Bernard Sfez via TikiWiki-devel <[email protected]>
| Newsgroups | gmane.comp.cms.tiki.devel |
|---|---|
| Message-ID | <[email protected]> |
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 <gary_c-39LOpZwlz1/[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