[Gambas-user] Git

[PICCORO McKAY Lenz]

some files not in git ignored are generated, can do two things:

1) "git status" ahd will show what files what changed, if wants to see
changes use "git diff",
2) "git reset --hard" and all the spurius changes will be discarting to
last commit upstream

TAKE IN CONSIDERATION that as exampel icon file something change of
permissions from 644 to 755 and this are a change from the point of view of
git

Lenz McKAY Gerardo (PICCORO)
http://qgqlochekone.blogspot.com

2018-08-10 14:42 GMT-04:00 Jussi Lahtinen <jussi.lahtinen at gmail.com>:

> Occasionally I get this message when trying to update the sources ("git
> pull" and no, I haven't edited the sources):
>
> "Please, commit your changes or stash them before you can merge.
> Aborting"
>
> And the solution has been "git reset --hard". How to avoid this? Any clue
> why this happens?
>
>
> Jussi
>
>
> ----[ Gambas mailing-list is hosted by https://www.hostsharing.net ]----
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.gambas-basic.org/pipermail/user/attachments/20180810/5b33f5b3/attachment.html>