in DevOps by
Q:
How you handle the merge conflicts in git?

1 Answer

0 votes
by

Follow the steps

Create Pull request

Modify according to the requirement by sitting with developers

Commit the correct file to the branch

Merge the current branch with master branch.

Click here to read more about DevOps
Click here to read more about Insurance

Related questions

0 votes
asked Jun 12, 2019 in DevOps by anonymous
0 votes
asked Nov 27, 2019 in DevOps by rajeshsharma
0 votes
asked Apr 23, 2020 in DevOps by rajeshsharma
0 votes
asked Apr 12, 2020 in QuickTest Professional (QTP) by amita rallin
+1 vote
asked Feb 20, 2020 in BlockChain by rahuljain1
...