-
Notifications
You must be signed in to change notification settings - Fork 263
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[MIGRATION] - Fixed some issues for project and package json
(cherry picked from commit 9710689)
- Loading branch information
1 parent
16c3955
commit 6174a08
Showing
4 changed files
with
29 additions
and
5 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
git fetch | ||
|
||
git checkout develop | ||
git pull --rebase | ||
git checkout ng16-develop | ||
git rebase origin/develop | ||
git push origin ng16-develop --force --no-verify | ||
echo -e "\e[34m===> Rebase complete \e[0m" | ||
|
||
if [ $? -eq 0 ]; then | ||
echo -e "\e[34m===> Resetting Migration Branch \e[0m" | ||
git checkout ng16-migration | ||
git reset --hard origin/develop | ||
|
||
git cherry-pick --quit | ||
echo -e "\e[34m===> Merge changes from cherry pick branch: ng16-develop cherry pick list\e[0m" | ||
git cherry-pick `git log --pretty=format:"%H" origin/develop..origin/ng16-develop --grep="[MIGRATION]" --reverse` -x | ||
if [ $? -eq 0 ]; then | ||
echo -e "\e[34m===> Cherry Picking complete! Pushing... \e[0m" | ||
git push origin ng16-migration --force --no-verify | ||
echo -e "\e[34m===> Pushed \e[0m" | ||
else | ||
echo -e "\e[31mThere was some error during cherry-picking of ng16-develop\e[0m" | ||
exit 1; | ||
fi | ||
else | ||
echo -e "\e[31mThere was some error during rebasing/resetting!\e[0m" | ||
exit 1; | ||
fi |