Redirect Notice
The previous page is sending you to
https://www.perforce.com/blog/vcs/what-is-a-merge-conflict-git
.
If you do not want to visit that page, you can
return to the previous page
.