[Gambas-user] Git

[Jussi Lahtinen]

It's more like annoyance and I wanted to know what is going on.
Thanks!


Jussi

On Fri, Aug 10, 2018 at 9:55 PM, Tobias Boege <taboege at gmail.com> wrote:

> On Fri, 10 Aug 2018, Jussi Lahtinen wrote:
> > 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?
> >
>
> In that case, git should also give you a list of files it thinks you
> altered.
>
> My guess: they are files that are automatically generated and updated by
> the compiler or IDE, like .settings and .startup. If you compile Gambas
> components from source, for instance, or open them in the IDE, those files
> will be changed and git thinks you made some precious changes that you
> don't want to accidentally overwrite.
>
> That these autogenerated files are under version control is the actual
> error here. That's actually easy to fix and I'll do it if this is indeed
> your problem.
>
> Regards,
> Tobi
>
> --
> "There's an old saying: Don't change anything... ever!" -- Mr. Monk
>
> ----[ 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/20180811/65eb5f9f/attachment.html>