estib 936ec01e8f Conflict Resolution: Add a confirmation modal ... If attempting to resolve conflicts on non-acestor-most commits, the user will be prompted to confirm whether they actually want that or not.		2024-10-10 10:30:29 +02:00
..
desktop	Conflict Resolution: Add a confirmation modal	2024-10-10 10:30:29 +02:00
web	*throws corkscrew over sholder*	2024-09-24 12:05:36 +02:00