[Tiki-devel] Git problem re cypht files
Gary Cunningham-Lee <gary_c-39LOpZwlz1/[email protected]>
| Newsgroups | gmane.comp.cms.tiki.devel |
|---|---|
| Message-ID | <[email protected]> |
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