The blue point of submitting PR both on Github and Gitee

 

1. Background

This file wants to describe how to keep Gitee as the main repository and also support working on Github. It mainly introduces the process of submitting the PR.

2. The process of merging commits into repo when working both on Gitee and Github

1) Initial status

At present, all commits are same for basic branch both on Gitee and Github.

2) Two developers work on Gitee and Github separately

Suppose that the two new commits are not conflict between them.

3) The process of merging commit

3. Submit PR on Github

1)A developer submits a PR on Github. Reviewers review it and trigger the test until it is ready to be merged.

2) Robot watches the PR and merges it when it is ready.

a) It adds a lock first.

b) Second, it opens a new PR on Gitee, synchronizes the codes from Github and merges it immediately.

c) Third, it synchronizes the codes merged back to the Github to update the basic branch of repo in order to keep it same with Gitee.

d) Forth, it closes the PR on Github and leaves a comment to tell the developer that the PR is merged.

e) Last, it unlocks.

4. Submit PR on Gitee

1)A developer submits a PR on Gitee. Reviewers review it and trigger the test until it is ready to be merged.

2) Robot watches the PR and merges it when it is ready.

a) It adds a lock first.

b) Second, it merges the PR immediately.

c) Third, it synchronizes the codes merged back to the Github to update the basic branch of repo in order to keep it same with Gitee.

d)Last, it unlocks.