PR means pull request.
This is similar to merging of two branches. Till now for merging we used git merge command. This is feasible during development
While working in production or portal or real branch, we can't merge 2 branches without validation and approval.
- A PR can help to accomplish this now.
- PR is no longer only about combining two branches. It has several security checks, work item integration, and numerous approvals.
Create a PR
Move to Pull Requests section in DeOps > Repo > Pull Request
- Choose your branches
- source branch: develop
- designation branch: release
- Click button “Create new Pull Request”
- Shows 6 Changes and 14 commits to be merge from develop to release branch
- Click Create, leave rest fields blank
- This create a new PR without any conflicts
Complete the PR - Using Merge (No fast forward) MERGE TYPE
Lets assume that everything is ok in PR
- in devOps > Go to that Merge
Complete option show Merge Type in drop down -SELECT Merge (No fast forward)
- It's a default integration strategy in Azure Repos, GitHub and most other git repo git providers.
- These commits of develop will all be saved; when the merge is finished, all 14 commits (of develop) + 3 (of release) will will show up over here (in release commits) And eventually a new commit is getting created along the way for merging.
- let complete using this merge option
- Check commits in release (all 14 +3) + 1 new is created
- 1 against 15 PR only
- this is a non-linear graph.
- Click newly created commit to see complete details