Adam

Avatar
  • Total activity 7
  • Last activity
  • Member since
  • Following 0 users
  • Followed by 0 users
  • Votes 0
  • Subscriptions 2
  • Created

    Using the PhpStorm Database Tools

    Hi,I'm looking for a new database tool, and so I'm evaluating the database features of PhpStorm which I use anyway (I prefer this than buying a separate tool). However, I see some issues with the t...
    • 1 follower
    • 0 comments
    • 0 votes
  • Created

    How to "accept theirs" during Git merge

    Hi,When I merge 2 Git branches in PhpStorm I often have conflicts. After the merge the conflicted filenames show in red and I see Git's tabs in the file (eg "<<<<<<< HEAD").In pretty much all cases...
    • 2 followers
    • 7 comments
    • 0 votes