Created
October 5, 2012 18:45
-
-
Save djalmaaraujo/3841629 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| error: The following untracked working tree files would be overwritten by checkout: | |
| lib/builder/.gitignore | |
| lib/builder/componentbuild/2.x/bootstrap.xml | |
| lib/builder/componentbuild/2.x/module.xml | |
| lib/builder/componentbuild/3.x/bootstrap.xml | |
| lib/builder/componentbuild/3.x/module.xml | |
| lib/builder/componentbuild/3.x/rollup.xml | |
| lib/builder/componentbuild/LICENSE | |
| lib/builder/componentbuild/README | |
| lib/builder/componentbuild/docs/docs.css | |
| lib/builder/componentbuild/docs/properties.html | |
| lib/builder/componentbuild/docs/targets.html | |
| lib/builder/componentbuild/files/langtemplate.txt | |
| lib/builder/componentbuild/files/moduletemplate.txt | |
| lib/builder/componentbuild/files/rolluptemplate.txt | |
| lib/builder/componentbuild/files/versioncode.txt | |
| lib/builder/componentbuild/lib/ant-contrib/ant-contrib-1.0b3-modified.jar | |
| lib/builder/componentbuild/lib/jslint/fulljslint.js | |
| lib/builder/componentbuild/lib/jslint/jslint-console.js | |
| lib/builder/componentbuild/lib/jslint/jslint-node.js | |
| lib/builder/componentbuild/lib/rhino/js.jar | |
| lib/builder/componentbuild/lib/yrb2json/yrb2json-console.js | |
| lib/builder/componentbuild/lib/yrb2json/yrb2json-test.js | |
| lib/builder/componentbuild/lib/yrb2json/yrb2json-test.pres | |
| lib/builder/componentbuild/lib/yrb2json/yrb2json.js | |
| lib/builder/componentbuild/lib/yuicompressor/ant-yuicompressor-2.4.5pre2.jar | |
| lib/builder/componentbuild/lib/yuicompressor/yuicompressor-1.0.jar | |
| lib/builder/componentbuild/lib/yuicompressor/yuicompressor-2.1.2.jar | |
| lib/builder/componentbuild/lib/yuicompressor/yuicompressor-2.3.3.jar | |
| lib/builder/componentbuild/lib/yuicompressor/yuicompressor-2.4.2.jar | |
| lib/builder/componentbuild/lib/yuicompressor/yuicompressor-2.4.3pr1.jar | |
| lib/builder/componentbuild/lib/yuicompressor/yuicompressor-2.4.4.jar | |
| lib/builder/componentbuild/lib/yuicompressor/yuicompressor-2.4.jar | |
| lib/builder/componentbuild/shared/cssmodule.xml | |
| lib/builder/componentbuild/shared/macrolib.xml | |
| lib/builder/componentbuild/shared/properties.xml | |
| lib/builder/componentbuild/shared/targets.xml | |
| lib/builder/componentbuild/templates/yui2/build.properties | |
| lib/builder/componentbuild/templates/yui2/build.xml | |
| lib/builder/componentbuild/templates/yui3/build.properties | |
| lib/builder/componentbuild/templates/yui3/build.xml | |
| lib/builder/componentbuild/templates/yui3/rollup/build.properties | |
| lib/builder/componentbuild/templates/yui3/rollup/build.xml | |
| lib/builder/componentbuild/templates/yui3/rollup/subcomponentone.properties | |
| lib/builder/componentbuild/templates/yui3/rollup/subcomponentone.xml | |
| lib/builder/componentbuild/templates/yui3/rollup/subcomponenttwo.properties | |
| lib/builder/componentbuild/templates/yui3/rollup/subcomponenttwo.xml | |
| Please move or remove them before you can switch branches. | |
| Aborting |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment