Azure Delops :
After push code to the branch
Goto azure devops
Go to (pipelines ) then click on , which ( branch ) we want to run pipelines .
Then click on ( run pipelines)
In that we have selecte branch , which branch we want to merge , then click on ( Run).
After completion of pipeline we have release the pipeline .
We have option release in pipeline drop down .
Then we have to select which environment we have to release then select that one .
Click on (create release ) create release.
Then add some comment regarding that release or commit then click on create
Git Hub:
Git Commands
Steps to get the updated code from DevelopmentV2 or UATFixesUI branch into your branch
1. Commit your changes into your branch by these commands
a. Git gui
b. Add your files
c. Enter commit message related to changes
d. Click on push
2. Switch to branch from where you want the updated code (DevelopmentV2 or UATFixesUI) For example if you want the updated code from DevelopmentV2 branch
3. Git checkout DevelopmentV2
4. Git pull origin DevelopmentV2
5. Git checkout your branchName
6. Git merge DevelopmentV2
7. Resolve Conflicts of any
8. Commit and push the code into yourbranch only
Step to merge your Code into DevelopmentV2 or UATFixesUI branch
If you want to merge your code into DevelopmentV2 or UATFixesUI) For example, if you want to merge your code into DevelopmentV2
1. Commit your changes into your branch by these commands
a. Git gui
b. Add your files
c. Enter commit message related to changes
d. Click on push
2. Git checkout DevelopmentV2
3. Git pull origin DevelopmentV2
4. Git merge yourBranchName
5. Resolve Conflicts of any
6. Commit and push into DevelopmentV2