[Date Prev][Date Next]
[Chronological]
[Thread]
[Top]
Re: git problems
- To: Mattes <rm@mh-freiburg.de>, openldap-technical@openldap.org
- Subject: Re: git problems
- From: Howard Chu <hyc@symas.com>
- Date: Sun, 22 Mar 2015 23:26:42 +0000
- In-reply-to: <1703-550f3880-45-64e49f80@227410988>
- References: <1703-550f3880-45-64e49f80@227410988>
- User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Firefox/38.0 SeaMonkey/2.35a1
Mattes wrote:
Hello list,
while upgrading my local git checkout I just realized that the repository contains serveral
files under contrib/ldapc++ that should never be put under version control:
It is standard OpenLDAP practice to include the configure script in the repo. End users should not be running automake/autoconf.
l$ git pull
Updating 7a7d941..ff7c0e5
error: Your local changes to the following files would be overwritten by merge:
contrib/ldapc++/Makefile.in
contrib/ldapc++/configure
contrib/ldapc++/examples/Makefile.in
contrib/ldapc++/src/Makefile.in
all these files are generated during the build process (by automake/autoconf)
Can someone with commit permission please fix this?
TIA Ralf Mattes
--
-- Howard Chu
CTO, Symas Corp. http://www.symas.com
Director, Highland Sun http://highlandsun.com/hyc/
Chief Architect, OpenLDAP http://www.openldap.org/project/