Dec 1, 2019 in DevOps
Q: How you handle the merge conflicts in git?

1 Answer

Dec 1, 2019

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

Oct 16, 2019 in Git
Nov 27, 2019 in DevOps
May 21 in Git