Proposal: Reviewing Pull Requests should change Git as a result

Sunday, February 20, 2022
Avatar

Hi all,

How I understand Spira's Pull Requests:

1. It is a task that after beeing reviewed doesn't change anything on Git side,

2. Somebody should go into a Git manually and proceed with merge actions directly there.

Expected behaviour that after status Under Review (or some other pull request status) it should be able to proceed with the Git merge action automaticaly without necessity to leave Spira and open any other instrument. Does Spira have this feature?

3 Replies
Sunday, February 20, 2022
Avatar
re: ilyapolyakov Sunday, February 20, 2022

That is not available currently. It is on our backlog as a feature.

It is a relatively complex feature because not only do you have to merge the branches upon successful pull request, but you have to also handle and file conflicts that may exists. There are many tools (see: https://www.inflectra.com/TaraVault/Git.aspx) that do this very well. The Spira pull requests are used to manage the workflow between developers, document the code review and ensure that the merge is done. The actual merge and resolution should be done in your Git client.

Regards

David

Sunday, February 20, 2022
Avatar
re: inflectra.david Sunday, February 20, 2022

I guess, the easiest way for Spira is to if a Pull Request was confirmed in Spira it should replace old files in Git with the new ones with the confirmation dialog about it. Not very complicated (if no other options than just replace) but rather effective. Otherwise, for example in our company, developers are saying that pull requsests are useless: it is just plus one more tool where they should do additional clicks as fter that they should switch back to Git where duplicate there decision about pull request there.

Sunday, February 20, 2022
Avatar
re: ilyapolyakov Sunday, February 20, 2022

Again not possible because of the way Git works.

Overwriting files would be incorrect. You need to handle merges and conflict resolutions.

Statistics
  • Started: Sunday, February 20, 2022
  • Last Reply: Sunday, February 20, 2022
  • Replies: 3
  • Views: 838