Closed sameer-bagde closed 1 month ago
I resolved the conflicts. It was because you merge the Guna request first, then you check my request, and at that time my repo was not synced with the updated one, so that's why conflicts were showing in the add and edit html component.
I resolved the conflicts. It was because you merge the Guna request first, then you check my request, and at that time my repo was not synced with the updated one, so that's why conflicts were showing in the add and edit html component.