Albert (Gong) Cheng's blog

A blog about programming, cloud computing, medicine, electronic medical record and healtcare IT.

Browse by Tags

Tagged Content List
  • Blog Post: Resolving code conflict using p4merge with git on Windows

    One of the most common task for professional software engineer is to merge code from multiple branch, on popular source control system git which enables configuring third party merging tool to facilitate this process. p4merge is a visual merging tool developed by Perforce. Here is how to get it work...
Page 1 of 1 (1 items)