first commit
This commit is contained in:
24
Windows/MERGE-TO-PRODUCTION.bat
Normal file
24
Windows/MERGE-TO-PRODUCTION.bat
Normal file
@@ -0,0 +1,24 @@
|
||||
@echo off
|
||||
|
||||
:: Prompt for confirmation
|
||||
set /p confirmation="Are you sure you want to merge 'development' into 'production'? (y/n): "
|
||||
|
||||
if /i "%confirmation%"=="y" (
|
||||
:: Switch to the production branch
|
||||
git checkout production
|
||||
|
||||
:: Pull the latest changes for production
|
||||
git pull origin production
|
||||
|
||||
:: Merge the development branch into production
|
||||
git merge development
|
||||
|
||||
:: Check if the merge was successful
|
||||
if %errorlevel%==0 (
|
||||
echo Merge successful. Please resolve any conflicts and commit.
|
||||
) else (
|
||||
echo Merge failed. Please resolve conflicts manually.
|
||||
)
|
||||
) else (
|
||||
echo Merge aborted.
|
||||
)
|
||||
Reference in New Issue
Block a user