SourceTree
Diff Arguments: \"$LOCAL\" \"$REMOTE\"
Merge Arguments: -merge -result=\"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"
Fork
> Merge Tool
Merger Path: C:\Program Files\SourceGear\Common\DiffMerge\sgdm.exe
Arguments: -merge -result=$MERGED $LOCAL $BASE $REMOTE
> External Diff Tool
Diff Tool Path: C:\Program Files\SourceGear\Common\DiffMerge\sgdm.exe
Arguments: $LOCAL $REMOTE
'Development > GIT' 카테고리의 다른 글
소스트리를 이용한 git merge request 및 fetch, merge, rebase 개념 및 사용법 - gitlab, bitbucket, github (0) | 2017.02.03 |
---|---|
git push 되돌리기 (0) | 2016.08.24 |
안정적인 DNS서비스 DNSEver