Re: git stash deletes/drops changes of

From: John Keeping <john@keeping.me.uk>
Date: May 24, 2013, 08:22 UTC
Message-ID: <20130524082253.GY27005@serenity.lan>
In-Reply-To: <20130523235711.GJ12252@machine.or.cz>

On Fri, May 24, 2013 at 01:57:12AM +0200, Petr Baudis wrote:

Show 14 quoted lines

>   Just to clear up on what the best practice is, I'd imagine the setup
> to be something like:
> 
> 	(a) Makefile contains inclusion of Makefile.include.
> 
> 	(b) There is a file like Makefile.include.template containing
> 	a template to be copied over and filled by the user.
> 
> 	(c) Makefile contains code that makes sure all variables that
> 	are supposed to be set are set and obsolete variables are not,
> 	since there is no mechanism to cause e.g. a merge conflict
> 	on change of Makefile.include.template.
> 
> Is there a better way to solve this?

I think the best practice would be what Git itself does ;-)

The Makefile sets default values for all parameters, some of which are inferred based on the system. It then includes config.mak, which allows the user to override any of these values.