Git Conflict resolve setting and Required tools
Download and Install : Tortoisegit https://tortoisegit.org/download/
Download and Install : KDiff3: https://sourceforge.net/projects/kdiff3/files/latest/download
1. "C:/Program Files/TortoiseGit/bin/TortoiseGitMerge.exe" -base:"$BASE" -mine:"$LOCAL" -theirs:"$REMOTE" -merged:"$MERGED"
2. "C:/Program Files (x86)/KDiff3/kdiff3.exe" "$LOCAL" "$REMOTE"
No comments:
Post a Comment