Ravindra BagaleCourses & study guides मराठी

Ravi Sir's Cards › Chapter 3: Branch, Merge, Rebase, Stash and Pull Requests

How do you resolve a merge conflict?

How do you resolve a merge conflict? Open the file, choose the correct text, remove the markers, git add, commit. Then run tests.

How do you resolve a merge conflict? Open the file, choose the correct text, remove the markers, git add, commit. Then run tests.
Download PNG

Lesson: 3.7 A conflict, line by line · मराठी card