All of our ant scripts should load a local.properties that override the build.properties. Build.properties should have some sensible values and should not be changed very often.
Local.properties should have a template and the template should be checked in, and local.properties should be in .gitignore. Is that pattern not working for some reason? On 4/14/13 5:01 PM, "Justin Mclean" <jus...@classsoftware.com> wrote: > Hi, > > I asked this before but got no answer - anyone have an idea of how to deal > with build.properties. In order to build the SDK you need to make changes to > it (eg TLF path), however we don't want to always check in those changes but > the file does needs to be in version control as you can't build without it. > > This will stop any use of git pull --rebase with "Cannot pull with rebase: You > have unstaged changes." > > Thanks, > Justin -- Alex Harui Flex SDK Team Adobe Systems, Inc. http://blogs.adobe.com/aharui
