Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge user branch into the master branch #124

Open
mandolyte opened this issue Jul 20, 2022 · 1 comment
Open

Merge user branch into the master branch #124

mandolyte opened this issue Jul 20, 2022 · 1 comment

Comments

@mandolyte
Copy link
Collaborator

DoD
Given a pull request against a user branch with no conflicts with the master branch, enable the administrator to merge the user branch to the master branch.

@mandolyte
Copy link
Collaborator Author

The merge feature is depends on having a pull request for the user branch. So the workflow and UI/X will be something like this:

  • translator informs administrator that their work is ready
  • the translator could send send the admin the CV spreadsheet for their branch as substantiation of the request to merge
  • the admin will go to the merge branch page in gateway Admin
  • the admin will select the repo/resource
  • all the branches in that repo will be shown and the admin will select one
  • the admin will click the "merge" button
  • the app will then create the PR using create pull request api
  • if the create PR API call succeeds, then proceed. Otherwise show the error.
  • if the PR response indicates that the branch has conflicts, then inform the user that it must be done manually. Otherwise, continue.
  • use the api to merge
  • if merge succeeds, inform the admin; otherwise show error message.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant