-
I don't know why, but while executing `git octopus` I get the following error. It doesn't break anything and the execution continues. It seems to happen on a .xls which git sees as a binary file
```
…
-
Hi
I was looking to parse the results of this sort of thing
```
git merge --no-commit branch-which-will-conflict
git diff --diff-filter=U > report.txt
```
There is also a diff3 format `git config m…
-
```
Tradução da seção "Using External Differencing Tools" e suas subseções:
* External diff
* External diff3
```
Original issue reported on code.google.com by `ccidral....@gmail.com` on 13 Mar 2…
-
```
Tradução da seção "Using External Differencing Tools" e suas subseções:
* External diff
* External diff3
```
Original issue reported on code.google.com by `ccidral....@gmail.com` on 13 Mar 2…
-
Followup to: http://stackoverflow.com/questions/25849742/is-it-possible-to-get-the-origin-of-lines-on-a-diff3-merge-conflict-or-a-composi
I know how to generate a file containing the diff3: just copy…
-
Saying which commit has failed (#45) only helps as far as one remembers what each commit is doing in the conflicting lines. In a conflict situation with regular rebase, `git diff` will show a *combine…
-
```
Tradução da seção "Using External Differencing Tools" e suas subseções:
* External diff
* External diff3
```
Original issue reported on code.google.com by `ccidral....@gmail.com` on 13 Mar 2…
-
If I raise the resolution variable by 1 point, there's a stack overflow on windows 11.
[bumpyflowers.txt](https://github.com/user-attachments/files/16945727/bumpyflowers.txt)
-
When there is a conflict in the one branch only (pulling conflicting commits), this plugin does not work. I will get `Conflict markers miss common base revision. Ensure you're using 'merge.conflictSty…
-
I want to implement a function `(diff3 a o b)` where `o` is common ancestor of `a` and `b`. The straightforward solution is combining editscripts of two diffs: `(patch o (combine (diff o a) (diff o b)…