git merge and difftool with beyond compare

[guymail...@gmail.com]

0down votefavorite

I am trying to use beyond compare to work with git for windows. I have followed the instructions on beyond compare site and added the required commands to the git config. git difftool seems to be working - activating beyond compare, but from some reason git merge does not work at all and it always performs the internal git merge and merge tool. can anyone help in configuring also git merge. another question regarding difftool --dir-diff with beyond compare - even though it indeed works i am still having problem if i am for example comparing workspace to a branch whre in the branch i have files which do not exist on the workspace branch. in such a case even though i can see the files in the folder compare issued by dir-diff, when i copy the files to the workspace side, after existing beyond compare the files are not on the workspace - it only update files that are already on the workspace. is there a way to fix this and make it also copy new files? Thanks

[Johannes Schindelin]

Hi,

On Tue, 24 Jan 2017, guymail...@gmail.com wrote:

> I am trying to use beyond compare to work with git for windows. I have
> followed the instructions on beyond compare site and added the required
> commands to the git config. git difftool seems to be working -
> activating beyond compare, but from some reason git merge does not work
> at all and it always performs the internal git merge and merge tool. can
> anyone help in configuring also git merge.

`git merge` does not use any "mergetools". Did you maybe intend to resolve
merge conflicts using `git mergetool`?

> another question regarding difftool --dir-diff with beyond compare -
> even though it indeed works i am still having problem if i am for
> example comparing workspace to a branch whre in the branch i have files
> which do not exist on the workspace branch. in such a case even though i
> can see the files in the folder compare issued by dir-diff, when i copy
> the files to the workspace side, after existing beyond compare the files
> are not on the workspace - it only update files that are already on the
> workspace. is there a way to fix this and make it also copy new files?

If I understand correctly, you mean to say that Beyond Compare does not
pick up on a file that is in only one of the two directories you asked it
to compare? If that is the case, it may be more of a Beyond Compare than a
Git issue.

Ciao,
Johannes

[Guy ,]

Hi, Thanks for the answer,

1) I have tried mergetool and it did not work does mergetool opens up the tool only for modified conflict and for deleted or added files it still remains on its default prompt?

2) as for the diff-tool I think it is a problem of GIT since GIT (in winodws at least) make copies of the files into temp folder on opens the compare tool (beyond compare) to compare these temp folders.

afterwards when existing it indeed updates the GIT workspace with the changes made to the files on the temp folder, but it seems to only work for files that were already in the workspace. if there was a new file on the other side which i copied from the beyond compare folder view to the workspace side it copies it to the temp folder but afterwards GIT does not seem to know to copy this new file also to the actual workspace - is there a way to solve this issue? 

Thanks

[Johannes Schindelin]

Hi,

On Wed, 25 Jan 2017, Guy , wrote:

> 1) I have tried mergetool and it did not work does mergetool opens up
> the tool only for modified conflict and for deleted or added files it
> still remains on its default prompt?

AFAICT mergetool works only on merge conflicts.

> 2) as for the diff-tool I think it is a problem of GIT since GIT (in
> winodws at least) make copies of the files into temp folder on opens the
> compare tool (beyond compare) to compare these temp folders.
> afterwards when existing it indeed updates the GIT workspace with the
> changes made to the files on the temp folder, but it seems to only work for
> files that were already in the workspace. if there was a new file on the
> other side which i copied from the beyond compare folder view to the
> workspace side it copies it to the temp folder but afterwards GIT does not
> seem to know to copy this new file also to the actual workspace - is there
> a way to solve this issue?

Did you try the builtin difftool? (You are asked at install time whether
you want to use the experimental difftool or the legacy scripted one)

Ciao,
Johannes

[guymail...@gmail.com]

Hi.

I have tried also with the built in difftool it makes no difference.

I need to find a way to make difftool with beyond compare when using folder compare to be able to add new files and delete files from the working space from within the folder compare. meaning i i do difftool --dir-diff someBranch and in that branch there a files hat i currently do not have and also some files were deleted realtive to my workspace i can see this under beyond compare folder compare but when i copy the new files and delete the files that were deleted, after existing the compare it does not actually add and delete the files from the workspace. i know i can do a merge but i want to do it in a much more controlled way using the folder compare.

i would really appreciate any suggestions and help on how to accomplish this (how to config GIT and or beyond compare)

Thanks