Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
I recently switched to command-line git for my personal projects.
I have used 3-way merge tools in the past and found them to be still a pain.
I really like the way CLI git handles merge file, it dumps both version into the file with <<<< and >>>>. How do i get that functionality for TFS which I am required to use at work?
I am not sure that
is going to be a possibility.
The git merge functionality is tied to the git source control, meaning that git merge will not merge two untracked files. This is subtly different from git diff which does allow for the comparison of two untracked files.
As an alternative, you may want to consider a workflow that uses git-tfs. The following is a helpful article on this workflow.