--- Johannes Schindelin <Johannes.Schindelin@xxxxxx> wrote:
> Besides, Alexandre hit an interesting bug, which is not at all easy to
> reproduce (except with three 70k files which I don't want to include in
> the test set). Since Alexandre provided _examples_ where I can _reproduce_
> the problem, I will be working on that bug, and not yours.
After compiling and installing "master" I was able to do the pull/merge.
The only conflict was in .gitignore, and it was that same conflict that
was causing the segfault. Normally (99% of the time) I pull
"next" into branchA (git-upstream), then I pull branchA into branchB (git-lt-work).
Both have various fixes, but I normally install and use branchB (git-lt-work).
It appears that that fix was in "next" which I hadn't already merged, and running
with an old "next" didn't allow me to the the "merge" since the fix for it was
in the "next" I was trying to merge...
Thus I needed to install "master" as is ("next" as is, would've worked just
as well), which contains the fix for the merge, so that I can merge the
branch which contains the fix ("next"/branchA).
I tested this and tried the exact same merge, with the newly merged and installed
branchB/git-lt-work, and it did work.
So it's all good now. Thanks!
Luben
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html