Skip to content

Commit 37a67be

Browse files
committed
Merge branch 'main' of ../.
2 parents 58792a8 + d4171fe commit 37a67be

File tree

2 files changed

+38
-0
lines changed

2 files changed

+38
-0
lines changed

.github/workflows/mirror.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Mirror to Organization Repo
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
8+
jobs:
9+
mirror:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Checkout
13+
uses: actions/checkout@v3
14+
with:
15+
fetch-depth: 0
16+
17+
- name: Clone Organization Repository
18+
env:
19+
GH_PAT: ${{ secrets.GH_PAT }}
20+
run: |
21+
git clone https://$GH_PAT@github.com/AJOUCCC/Coding-Test-Problem-Solving_SSH.git organization-repo
22+
cd organization-repo
23+
git checkout main
24+
git pull origin main
25+
26+
- name: Set Git Pull Strategy (Fix Merge Error)
27+
run: |
28+
git config --global pull.rebase false # Merge 방식 사용
29+
30+
- name: Merge Changes
31+
run: |
32+
cd organization-repo
33+
git config --global user.name "soseongha"
34+
git config --global user.email "sosongha3@ajou.ac.kr"
35+
git pull ../. main --allow-unrelated-histories --no-edit
36+
git push origin main

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
.github/workflows/*
2+
README.md

0 commit comments

Comments
 (0)