Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [egit-dev] merge tool workflow

I've been playing with that patch from Remy, what's the etiquette for updating someone else's gerrit review?  Can I push my update or create a new one that refers to the original work?  It's still definitely still work in progress but might stir more interest.

On 07/04/2011, at 22:52, Matthias Sohn <matthias.sohn@xxxxxxxxxxxxxx> wrote:

2011/4/7 Bernard Leach <leachbj@xxxxxxxxxxxxxxxx>
That Customize Perspective approach certainly solves the immediate need.

A more sophisticated commit dialog could be interesting in some cases but wouldn't really help with the merge/rebase process since its too late in the workflow and its modal so isn't going to let you modify files/run builds/run tests etc to verify the semantic merge.

We think about replacing the modal dialog by a view to get rid of the modality part of the problem.

For full flexibility we probably should provide the "git merge --no-commit" option (as far as I understand this
option without ever having used it)

Back to the top