Community
Participate
Working Groups
Created attachment 245245 [details] Screenshots When I have a conflict in a binary file, after the pull EGit damage the file.
In command line it's possible to use git checkout --out or --theirs Egit doesn't have this utility.
(In reply to Oscar Ortiz from comment #1) > In command line it's possible to use git checkout --out or --theirs Egit > doesn't have this utility. See bug 347835 for that.
Does the file which gets damaged contain a null byte in the first 8k bytes ? JGit doesn't yet support git attributes which are usually used to configure files which should be considered to be binary. Until git attributes are available JGit only can use a heuristic check: if a null byte is found in the first 8k bytes it considers a file to be binary. When this check fails but the file is binary anyway it may damage the file by using the line based merge algorithm.
Created attachment 245268 [details] Replace with Commit is disabled These are the first lines that show vi en binary mode: 0000000: 524f 532e 3630 3035 3000 0000 0000 000a ROS.60050....... 0000010: 0000 00af 0012 a000 ffff ffff 1000 7202 ..............r. With command line or source tree we don't have this problem with the binaries. We want to use the plugin, recently we have migrated to Git, and we want to avoid the use of the command line and the plugin at the same time. Another problem is the Replace with -> commit, in conflicting state is disabled.
[Batch change] Remove pre-3.7 Target Milestones If anyone on CC list is going to fix/implement this, please assign a new 3.7+ target milestone.
looks like a bug in JGit, the file clearly contains null bytes in the beginning so JGit should not touch it during merge
Is the repo public? Can we have a look at it? If not, is at least the file which get corrupted a file you can share?
(In reply to Oscar Ortiz from comment #1) > In command line it's possible to use git checkout --out or --theirs Egit > doesn't have this utility. Yes, please add 'Add to index theirs/ours' below the option to lunch the 'Merge tool'. For now as a work around I have created an external run configuration (see `eclipse-bug-440044-work-around-using-external-run-configuration.png` attachment)
Created attachment 262547 [details] eclipse-bug-440044-work-around-using-external-run-configuration
(In reply to Oscar Ortiz from comment #4) ... > Another problem is the Replace with -> commit, in conflicting state is > disabled. Yes, this is another good way to handle binary file conflicts. I naturally tried this approach first but that option is disabled as stated.
