git local remote base merge

http://stackoverflow.com/questions/5440610/git-and-difftool-problems-what-do-local-and-remote-point-to

thereare4componentstothis(notethatbeforethisstep,youwouldhavealreadydonealocal-checkin.)

Thelocal-checkinthatyourgittreehas:LOCAL

Theheadoftheremoterepository(thatisgoingtobemerged):REMOTE

commonancestortobothLOCALandREMOTE:BASE

Thefilethatwillbewrittenasaresult:MERGED.

相关推荐