Listing Conflicts when Pushing

[buffalom]

When I tolgee push, there can be conflicts. The CLI tells me if that is the case and let's me choose what to do about it. However, I would like to know what the conflicts are. Ideally there would be some kind of diff that is shown.

As a cherry on top: Perhaps I could even choose which I would like to keep and which I would like to override.

[Anty0]

@buffalom Hi! Thanks for the feature request! ^^
I agree, it would be a nice addition. Looking at the current implementation, we might be able to pass conflicts from the single-step importer used by the CLI. After the branching feature is implemented, we could reuse the revision to check for any changes between the two import attempts to avoid unexpected results. That would solve the main issue with this feature – making sure that the conflicts we show are final and won't change after the user accepts the resolution method.

The branching feature is still in development. I'll see what I can do once it's out!

[tronical]

Ditto here, would be really nice to know what the conflicts are to help make the right decision.