Resolve merge conflict in NewProject.bat - take most recent changes

This commit is contained in:
Nathan
2025-09-15 10:31:48 -06:00
10 changed files with 4132 additions and 9 deletions

View File

@@ -18,7 +18,11 @@ set projectRoot=%yyyy%-%mm%-%dd%_%projectName%
mkdir "%projectRoot%"
mkdir "%projectRoot%\Assets\VO"
if exist "%~dp0NewDaily.bat" copy /Y "%~dp0NewDaily.bat" "%projectRoot%\Assets\VO\NewDaily.bat" >nul
if exist "A:\1 Amazon_Active_Projects\3 ProjectStructure\NewDaily.bat" copy /Y "A:\1 Amazon_Active_Projects\3 ProjectStructure\NewDaily.bat" "%projectRoot%\Assets\VO\NewDaily.bat" >nul
:: Create Blends structure
mkdir "%projectRoot%\Blends\animations\"
mkdir "%projectRoot%\Blends\stills\img-BG"
:: Create Deliverable structure
mkdir "%projectRoot%\Deliverable\"
@@ -40,7 +44,6 @@ if exist "%~dp0components\gitattributes" copy /Y "%~dp0components\gitattributes"
:: Initialize git and install Git LFS
pushd "%projectRoot%" >nul
git init
git config --global --add safe.directory "%projectRoot%"
git lfs install
git add . -v
git commit -m "init"