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

▼ Show 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.

DevOps
Learn More with Madanswer

Related questions

0 votes
asked Jun 12, 2019 in DevOps by anonymous
...