1

We have two separate team projects (Let's call them Staging and Prod) within our single Azure DevOps Organisation. Currently, both team project code bases are nearly identical. However, we've decided to use Staging to develop and test all of our changes and once successfully verified, we promote/merge the code across to the Prod team project.

For example:

[[ Staging Team Project ]]
File A - v1.1 - (latest changes, tested, verified and ready for promotion to Prod.)
File B - v3.2 - (latest changes, tested, verified and ready for promotion to Prod.)


[[ Prod Team Project ]]
File A - v1.0 - (last release currently in Live.)
File B - v3.1 - (last release currently in Live.)

Using the above as an example, is there a way to carry out this code promotion/merge of the two files from the Staging team project to Prod, or is our only option to perform a manual merge externally, using something like Beyond Compare and then check the merge into the Prod repository?

hitman126
  • 699
  • 1
  • 12
  • 43
  • This is possible, but only if you use TFVC as source control system. if you use git you'd have to fall back to some external stuff – D.J. Aug 23 '21 at 13:38

1 Answers1

1

Pull request can be created between branches in same repo or from forked repo, but cannot be created between different repos in two projects.

As an alternative, you can create a new branch temp based on Prod repo branch, replace the files(you can checkout/checkin on local machine to replace, or directly upload files to replace on Azure DevOps UI), then create a pull request from temp branch to Prod branch to validate and merge accordingly.

wade zhou - MSFT
  • 1,397
  • 1
  • 3
  • 6
  • Wade Zhou........is your suggestion possible across two team projects though? Please note, that is the critical point made on this entire issue - it is not a merging of code across two repos of the same team project. The team projects in our case are separate. – hitman126 Aug 24 '21 at 06:17
  • Hi @hitman126, as i stated, the workaround is to put codes in same repo with two branches, you cannot merge code between different repros without any relationship directly. – wade zhou - MSFT Aug 24 '21 at 06:21