Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [jgit-dev] conflicts between branches

I have such situation that I don't store working copy and repository cloning takes 15 minutes for large projects :( Is there any possibility to examine merge without storing also working copy?

2014-10-09 15:36 GMT+02:00 Alex Blewitt <alex.blewitt@xxxxxxxxx>:
A conflict is the result of a merge operation, not a specific state. Different merge strategies will generate different conflicts, for example. I believe you’d have to attempt a merge and then get the conflicts from the MergeResult.


On 9 Oct 2014, at 14:24, Tomasz Prus <to.prus@xxxxxxxxx> wrote:

> Hi,
> is it possible to get info about potential conflicts between two branches on the bare repository (will be a conflict if I try merge branch A to branch B) ?
> Best,
> Tomo
> _______________________________________________
> jgit-dev mailing list
> jgit-dev@xxxxxxxxxxx
> To change your delivery options, retrieve your password, or unsubscribe from this list, visit

Back to the top