0 votes
in DevOps by (30.8k points)
How you handle the merge conflicts in git?

1 Answer

0 votes
by (23.1k points)

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 Sep 5, 2020 in Git by SakshiSharma (30.8k points)
0 votes
asked Nov 20, 2022 in Azure Databricks by Robin (13.0k points)
0 votes
asked Mar 3, 2020 in DevOps by rajeshsharma (23.1k points)