Git: Only handle conflicts after rebase if they are present
Git: Only handle conflicts after rebase if they are present

rebase might fail for other reasons (detached head, unconfigured upstream...)

Change-Id: If80844dcbfd4f61fdd44d77f934e86ff96f0a1d3
Reviewed-by: Tobias Hunger <012f8d714267bccc9d4766fbeace9f175fcc70c4@digia.com>

richardmg/qtcreator,xianian/qt-creator,AltarBeastiful/qt-creator,farseerri/git_code,martyone/sailfish-qtcreator,kuba1/qtcreator,Distrotech/qtcreator,xianian/qt-creator,farseerri/git_code,xianian/qt-creator,AltarBeastiful/qt-creator,malikcjm/qtcreator,malikcjm/qtcreator,malikcjm/qtcreator,richardmg/qtcreator,martyone/sailfish-qtcreator,richardmg/qtcreator,darksylinc/qt-creator,duythanhphan/qt-creator,malikcjm/qtcreator,xianian/qt-creator,duythanhphan/qt-creator,AltarBeastiful/qt-creator,danimo/qt-creator,AltarBeastiful/qt-creator,Distrotech/qtcreator,farseerri/git_code,kuba1/qtcreator,amyvmiwei/qt-creator,colede/qtcreator,martyone/sailfish-qtcreator,martyone/sailfish-qtcreator,martyone/sailfish-qtcreator,maui-packages/qt-creator,amyvmiwei/qt-creator,Distrotech/qtcreator,darksylinc/qt-creator,AltarBeastiful/qt-creator,danimo/qt-creator,richardmg/qtcreator,malikcjm/qtcreator,omniacreator/qtcreator,danimo/qt-creator,danimo/qt-creator,xianian/qt-creator,kuba1/qtcreator,kuba1/qtcreator,amyvmiwei/qt-creator,AltarBeastiful/qt-creator,richardmg/qtcreator,omniacreator/qtcreator,duythanhphan/qt-creator,richardmg/qtcreator,darksylinc/qt-creator,darksylinc/qt-creator,farseerri/git_code,xianian/qt-creator,colede/qtcreator,amyvmiwei/qt-creator,farseerri/git_code,duythanhphan/qt-creator,colede/qtcreator,colede/qtcreator,AltarBeastiful/qt-creator,amyvmiwei/qt-creator,omniacreator/qtcreator,danimo/qt-creator,duythanhphan/qt-creator,richardmg/qtcreator,martyone/sailfish-qtcreator,duythanhphan/qt-creator,duythanhphan/qt-creator,colede/qtcreator,darksylinc/qt-creator,farseerri/git_code,farseerri/git_code,malikcjm/qtcreator,omniacreator/qtcreator,martyone/sailfish-qtcreator,maui-packages/qt-creator,kuba1/qtcreator,darksylinc/qt-creator,amyvmiwei/qt-creator,danimo/qt-creator,AltarBeastiful/qt-creator,amyvmiwei/qt-creator,martyone/sailfish-qtcreator,malikcjm/qtcreator,darksylinc/qt-creator,omniacreator/qtcreator,xianian/qt-creator,Distrotech/qtcreator,kuba1/qtcreator,maui-packages/qt-creator,martyone/sailfish-qtcreator,danimo/qt-creator,farseerri/git_code,omniacreator/qtcreator,colede/qtcreator,amyvmiwei/qt-creator,kuba1/qtcreator,colede/qtcreator,maui-packages/qt-creator,danimo/qt-creator,kuba1/qtcreator,Distrotech/qtcreator,danimo/qt-creator,xianian/qt-creator,omniacreator/qtcreator,maui-packages/qt-creator,kuba1/qtcreator,xianian/qt-creator,Distrotech/qtcreator,darksylinc/qt-creator,maui-packages/qt-creator,maui-packages/qt-creator,Distrotech/qtcreator