• Home
  • Recent Q&A
  • Java
  • Cloud
  • JavaScript
  • Python
  • SQL
  • PHP
  • HTML
  • C++
  • Data Science
  • DBMS
  • Devops
  • Hadoop
  • Machine Learning
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.

Related questions

0 votes
asked Mar 3, 2020 in DevOps by rajeshsharma
0 votes
asked Mar 9, 2020 in DevOps by Hodge
...