Hi,
I am trying to merge two branches but I am running into merge conflicts. Is there any way I can resolve the merge conflicts in Gitlab UI or do I have to do it manually?
Thank you
Related topics
| Topic | Replies | Views | Activity | |
|---|---|---|---|---|
| Resolving merge conflicts | 0 | 975 | May 6, 2016 | |
| There are merge conflicts | 0 | 420 | November 17, 2021 | |
| Navigating Merge Conflicts for Beginners: Tips and Tools? | 0 | 60 | July 4, 2024 | |
| How to solve merge conflict using API | 1 | 554 | May 18, 2021 | |
| How to merge the project from one of my branch to the other's project branch | 0 | 292 | October 4, 2019 |