Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 467535 - [gitflow] explicitly notify the user about merge/rebase conflicts
Summary: [gitflow] explicitly notify the user about merge/rebase conflicts
Status: RESOLVED FIXED
Alias: None
Product: EGit
Classification: Technology
Component: Gitflow (show other bugs)
Version: 4.0   Edit
Hardware: PC Mac OS X
: P3 normal (vote)
Target Milestone: 4.0   Edit
Assignee: Max Hohenegger CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2015-05-18 18:46 EDT by Matthias Sohn CLA
Modified: 2015-06-01 03:22 EDT (History)
1 user (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Matthias Sohn CLA 2015-05-18 18:46:43 EDT 
If a gitflow operation stops due to a merge conflict a result dialog should notify the user what happened and give hints how to resolve them.

If e.g. "Finish feature" faces a conflict when trying to merge the feature branch since another feature or fix has touched the same line no explicit message tells the user what happened. Compare this with how EGit handles plain merge or rebase conflicts.
Comment 1 Max Hohenegger CLA 2015-05-19 18:50:53 EDT 
I think all finish operations and feature rebase have to be considered in this bug.
For feature rebase, I'm already experimenting with a simple message box, but I am not sure if I need to handle more than just MergeStatus.CONFLICTING.
Do you think that would be sufficient? Also for the finish operations?

Release finish is more difficult to handle because there are two merges. One to develop, and another to master. Conflicts during the merge to master may have to be treated differently, though because in a git flow repository that can only happen if something went wrong in the past, e.g. when somebody committed to master directly.
Comment 2 Max Hohenegger CLA 2015-05-23 11:43:25 EDT 
https://git.eclipse.org/r/#/c/48516/