git local remote base merge
http://stackoverflow.com/questions/5440610/git-and-difftool-problems-what-do-local-and-remote-point-to
there are 4 components to this (note that before this step, you would have already done a local-checkin.)
The local-checkin that your git tree has: LOCAL
The head of the remote repository (that is going to be merged): REMOTE
common ancestor to both LOCAL and REMOTE: BASE
The file that will be written as a result: MERGED.
Guess you like
Origin http://10.200.1.11:23101/article/api/json?id=326753683&siteId=291194637
Recommended
Ranking