0 votes
in DevOps by
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.

...