Those “Accept Yours” & “Accept Theirs” buttons in GoLand’s conflicts dialog are a bit of a tease. Might be that I’m missing something (which is possible) but I though a file appearing here means that I manually need to review it. Would anyone blindly accept changes like this?
@lmika I actually use this all the time. At work, we using a code styling service that runs on every push to a PR. This frequently causes merge conflicts if I try to push more changes up a few minutes later. When this happens, I always accept my changes because the service will just run again.
@lukebouch Yeah, I have to admit: about an hour after that post, I started using these buttons as well. Guess they weren’t the tease I thought they were. 😅