diff --git a/.github/workflows/MoveVersionToMainBranch.yml b/.github/workflows/MoveVersionToMainBranch.yml index a9f4cb3d..76e2d54a 100644 --- a/.github/workflows/MoveVersionToMainBranch.yml +++ b/.github/workflows/MoveVersionToMainBranch.yml @@ -17,8 +17,8 @@ jobs: - name: git merge to main run: | - git config --global user.name 'hongsjae' - git config --global user.email 'gtw030488w@gmail.com' + git config --global user.name 'Team return' + git config --global user.email 'team.return@gmail.com' git config pull.rebase false git checkout -t origin/master echo $(git merge -Xtheirs origin/release -m "🚀 :: Deploy version ${{ env.RELEASE_VERSION }} to AppStore") diff --git a/.github/workflows/MoveVersionToReleaseBranch.yml b/.github/workflows/MoveVersionToReleaseBranch.yml index cf76c129..c5a51646 100644 --- a/.github/workflows/MoveVersionToReleaseBranch.yml +++ b/.github/workflows/MoveVersionToReleaseBranch.yml @@ -16,8 +16,8 @@ jobs: - name: git merge to release run: | - git config --global user.name 'hongsjae' - git config --global user.email 'gtw030488@gmail.com' + git config --global user.name 'Team return' + git config --global user.email 'team.return@gmail.com' git config pull.rebase false git checkout -t origin/release echo $(git merge -Xtheirs origin/develop)