FAQs

How Do I Create PRs at the Same Time If Multiple Code Repositories Have Compilation Dependencies?

Sign-off-by Operations

Handling Exceptions of DCO Verification

Rollback

Resolving Merge Conflicts

How Do I Create PRs at the Same Time If Multiple Code Repositories Have Compilation Dependencies?

During the development of the operating system (OS), it is common that multiple code repositories have compilation dependencies. Therefore, the PRs need to be created and merged at the same time. For this reason, Gitee uses issues as the association identifiers for code repositories with dependency dependencies to commit the PRs. Follow the operations below:

  1. Create an issue in any of the code repositories.
  2. Associate PRs need to be built and merged at the same time with the issue. For details, visit https://gitee.com/help/articles/4142.
  3. After the build is triggered, the build center identifies the PRs associated with the same issue, downloads the build, and merges the PRs into the code library after the code is approved.

Sign-off-by Operations

How to Add signoff Records in Commits?

Execute the **git commit -s **or git commit –signo command to submit signoff records.

How to Add a signoff record to the Previous Commit?

Execute the git commit --amend --signoff command.

For more options about commit, see https://git-scm.com/docs/git-commit.

Handling Exceptions of DCO Verification

After developers submit Pull Request, commenting "start build" in the PR will trigger the gated commit. In this sense, you should consider:

  1. Whether the DCO is signed.
  2. Whether the commits contain Signed-off-by information.

The possible causes for a verification failure include:

  1. The DCO is not signed. The following messages will be displayed:

    The following commit users do not signed the DCO:
    
    •345612213123
    

    Solution

    Click [https://dco.openharmony.io/sign/Z2l0ZWUlMkZvcGVuX2hhcm1vbnk=) to sign the DCO or check the signing status.

    Enter check dco in the Pull Requests comment box and click Comment. The system will check the DCO signing status again.

  2. The commits do not contain Signed-off-by information. The following messages will be displayed:

    The following commits do not contain Sign-off-by information:
    
    •345612213123
    

    Solution

    Add the Sign-off-by information by referring to Sign-off-by Operations.

    Enter check dco in the Pull Requests comment box and click Comment. The system will check the DCO signing status again.

Rollback

Visit https://gitee.com/help/articles/4195.

Resolving Merge Conflicts

Visit https://gitee.com/help/articles/4194.