Closed COrtsJosep closed 2 months ago
What happens if my branch modifies some files that have also been modified in main? Would that cause a conflict?
If there are some conflicts, the merge pull request will fail and shows conflicts in Merge pull request page. If no conflict, then will shows like the picture
What happens if my branch modifies some files that have also been modified in main? Would that cause a conflict?