Bug 515148 - Pull When pulling : Rebase - ignored
Summary: Pull When pulling : Rebase - ignored
Status: NEW
Alias: None
Product: EGit
Classification: Technology
Component: Core (show other bugs)
Version: 4.6.1   Edit
Hardware: PC Windows 7
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2017-04-12 02:44 EDT by leokom leokom CLA
Modified: 2017-04-12 02:44 EDT (History)
0 users

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description leokom leokom CLA 2017-04-12 02:44:58 EDT
SCENARIO:

Have some unstaged changed.
Have 1 commit in your local 'develop' branch that is not pushed to 'origin/develop' yet.
Have 1 commit in your 'origin/develop' branch not pulled to 'develop yet

Team -> Pull... -> When pulling : Rebase -> Finish

A window is shown : "Cannot rebase repository... You have uncommitted changes"

Press Reset

EXPECTED:
Rebase is done after Reset

ACTUALLY:
Reset is done.
Rebase pull option has been ignored, merge commit created instead.