this post was submitted on 02 Jul 2023
6 points (100.0% liked)
Ask Experienced Devs
1232 readers
1 users here now
Icon base by Delapouite under CC BY 3.0 with modifications to add a gradient
founded 1 year ago
MODERATORS
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments
Checkout doesn't prevent merge conflicts (unless you configure exclusive checkout which is quite annoying). We used perforce and definitely had merge conflicts, though they weren't as crazy as a long git branch would be.