Ben Ramsey on Nostr: npub1hxquj…7mxz5 Oh, yeah. Sorry. It was this: ...
npub1hxqujespmq3rm9qthmery6e8x0hst8mecdlg6wjws5udteh4f5xqg7mxz5 (npub1hxq…mxz5) Oh, yeah. Sorry. It was this: https://www.jetbrains.com/help/phpstorm/resolve-conflicts.html
Since I use the command line mostly, I never see that UI, but you can get it it by right-clicking a conflicted file, choosing to resolve conflicts, and then clicking the Merge button. I had gotten that far before but I didn’t click the Merge button because I didn’t know what it would do. 🤣
Since I use the command line mostly, I never see that UI, but you can get it it by right-clicking a conflicted file, choosing to resolve conflicts, and then clicking the Merge button. I had gotten that far before but I didn’t click the Merge button because I didn’t know what it would do. 🤣