<style>
/* Changing the layout to use less space for mobiles */
@media screen and (max-device-width: 480px), screen and (-webkit-min-device-pixel-ratio: 2) {
    #email-body { min-width: 30em !important; }
    #email-page { padding: 8px !important; }
    #email-banner { padding: 8px 8px 0 8px !important; }
    #email-avatar { margin: 1px 8px 8px 0 !important; padding: 0 !important; }
    #email-fields { padding: 0 8px 8px 8px !important; }
    #email-gutter { width: 0 !important; }
}
</style>
<div id="email-body">
<table id="email-wrap" align="center" border="0" cellpadding="0" cellspacing="0" style="background-color:#f0f0f0;color:#000000;width:100%;">
    <tr valign="top">
        <td id="email-page" style="padding:16px !important;">
            <table align="center" border="0" cellpadding="0" cellspacing="0" style="background-color:#ffffff;border:1px solid #bbbbbb;color:#000000;width:100%;">
                <tr valign="top">
                    <td bgcolor="#3b4d64" style="background-color:#3b4d64;color:#ffffff;font-family:Arial,FreeSans,Helvetica,sans-serif;font-size:12px;line-height:1;"><img src="https://issues.jboss.org/s/en_US-g3yjjf/733/58/_/jira-logo-scaled.png" alt="" style="vertical-align:top;" /></td>
                </tr><tr valign="top">
    <td id="email-banner" style="padding:32px 32px 0 32px;">

                
        
        
            <table align="left" border="0" cellpadding="0" cellspacing="0" width="100%" style="width:100%;">
    <tr valign="top">
        <td style="color:#505050;font-family:Arial,FreeSans,Helvetica,sans-serif;padding:0;">
                                        <img id="email-avatar" src="https://community.jboss.org/people/adietish/avatar/16.png" alt="" height="48" width="48" border="0" align="left" style="padding:0;margin: 0 16px 16px 0;" />
                        <div id="email-action" style="padding: 0 0 8px 0;font-size:12px;line-height:18px;">
                                    <a class="user-hover" rel="adietish" id="email_adietish" href="https://issues.jboss.org/secure/ViewProfile.jspa?name=adietish" style="color:#003366;">Andre Dietisheim</a>
     updated <img src="https://issues.jboss.org/images/icons/bug.gif" height="16" width="16" border="0" align="absmiddle" alt="Bug"> <a style='color:#003366;text-decoration:none;' href='https://issues.jboss.org/browse/JBIDE-12138'>JBIDE-12138</a>
            </div>
                        <div id="email-summary" style="font-size:16px;line-height:20px;padding:2px 0 16px 0;">
                <a style='color:#003366;text-decoration:none;' href='https://issues.jboss.org/browse/JBIDE-12138'><strong>serveradapter is git forcing without asking when error occurs in normal git commit</strong></a>
            </div>
                    </td>
    </tr>
</table>
        
    </td>
</tr>
<tr valign="top">
    <td id="email-fields" style="padding:0 32px 32px 32px;">
        <table border="0" cellpadding="0" cellspacing="0" style="padding:0;text-align:left;width:100%;" width="100%">
            <tr valign="top">
                <td id="email-gutter" style="width:64px;white-space:nowrap;"></td>
                <td>
                    <table border="0" cellpadding="0" cellspacing="0" width="100%">
                                                    <tr valign="top">
        <td style="color:#000000;font-family:Arial,FreeSans,Helvetica,sans-serif;font-size:12px;padding:0 10px 10px 0;white-space:nowrap;">
            <strong style="font-weight:normal;color:#505050;">Change By:</strong>
        </td>
        <td style="color:#000000;font-family:Arial,FreeSans,Helvetica,sans-serif;font-size:12px;padding:0 0 10px 0;width:100%;">
                                                <a class="user-hover" rel="adietish" id="email_adietish" href="https://issues.jboss.org/secure/ViewProfile.jspa?name=adietish" style="color:#003366;">Andre Dietisheim</a>
                            (13/Jun/12 10:41 AM)
        </td>
    </tr>
            <tr valign="top">
        <td style="color:#000000;font-family:Arial,FreeSans,Helvetica,sans-serif;font-size:12px;padding:0 10px 10px 0;white-space:nowrap;">
            <strong style="font-weight:normal;color:#505050;">Description:</strong>
        </td>
        <td style="color:#000000;font-family:Arial,FreeSans,Helvetica,sans-serif;font-size:12px;padding:0 0 10px 0;width:100%;">
                                    <span class="diffcontext">Was&nbsp;noticed&nbsp;through&nbsp;reading&nbsp;the&nbsp;code&nbsp;that&nbsp;if&nbsp;another&nbsp;error&nbsp;than&nbsp;&quot;up&nbsp;to&nbsp;date&quot;&nbsp;occurs&nbsp;jbosstools&nbsp;is&nbsp;*forcing*&nbsp;a&nbsp;push&nbsp;witohut&nbsp;asking&nbsp;the&nbsp;user.<br><br>This&nbsp;must&nbsp;be&nbsp;fixed&nbsp;since&nbsp;otherwise&nbsp;you&nbsp;are&nbsp;nuking&nbsp;users&nbsp;history!<br><br>Steps&nbsp;to&nbsp;reproduce:<br><br></span>
<span class="diffremovedchars" style="background-color:#ffe7e7;text-decoration:line-through;">#</span>
<span class="diffaddedchars" style="background-color:#ddfade;">1)&nbsp;EXEC:</span>
<span class="diffcontext">&nbsp;create&nbsp;myapp&nbsp;in&nbsp;tools&nbsp;with&nbsp;openshift&nbsp;in&nbsp;~/git/myapp<br><br></span>
<span class="diffremovedchars" style="background-color:#ffe7e7;text-decoration:line-through;">#</span>
<span class="diffaddedchars" style="background-color:#ddfade;">2)&nbsp;EXEC:</span>
<span class="diffcontext">&nbsp;take&nbsp;the&nbsp;git&nbsp;url&nbsp;and&nbsp;clone&nbsp;the&nbsp;app&nbsp;into&nbsp;a&nbsp;separate&nbsp;directory&nbsp;(to&nbsp;simulate&nbsp;other&nbsp;changes)<br>mkdir&nbsp;temp</span>
<span class="diffaddedchars" style="background-color:#ddfade;">&nbsp;(different&nbsp;directory&nbsp;than&nbsp;the&nbsp;git-repo&nbsp;created&nbsp;by&nbsp;our&nbsp;tooling!!)</span>
<span class="diffcontext"><br>cd&nbsp;temp<br>git&nbsp;clone&nbsp;ssh:&lt;specifichost&gt;/myapp.git/&nbsp;<br>cd&nbsp;myapp<br></span>
<span class="diffaddedchars" style="background-color:#ddfade;">3)&nbsp;EXEC:</span>
<span class="diffcontext">edit&nbsp;README&nbsp;or&nbsp;some&nbsp;other&nbsp;existing&nbsp;file<br></span>
<span class="diffaddedchars" style="background-color:#ddfade;">4)&nbsp;EXEC:</span>
<span class="diffcontext">git&nbsp;commit&nbsp;-m&nbsp;&quot;external&nbsp;change&quot;&nbsp;README<br></span>
<span class="diffaddedchars" style="background-color:#ddfade;">5)&nbsp;EXEC:</span>
<span class="diffcontext">git&nbsp;push<br><br>&lt;ton&nbsp;of&nbsp;output&gt;<br><br></span>
<span class="diffaddedchars" style="background-color:#ddfade;">6)&nbsp;ASSERT:&nbsp;(verifying&nbsp;that&nbsp;now&nbsp;pushing&nbsp;from&nbsp;the&nbsp;repo&nbsp;created&nbsp;by&nbsp;our&nbsp;tooling&nbsp;is&nbsp;now&nbsp;failing&nbsp;because&nbsp;of&nbsp;&quot;non-fastforward&quot;):<br></span>
<span class="diffcontext">cd&nbsp;~/git/myapp<br>git&nbsp;push&nbsp;will&nbsp;now&nbsp;fail&nbsp;with&nbsp;something&nbsp;like:<br><br>ax@slowbeard:&nbsp;$&nbsp;git&nbsp;push&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;~/git/appmy<br>To&nbsp;ssh://b8ab8a46a2984d16b1666f3b172c4199@appmy-man.rhcloud.com/~/git/appmy.git/<br>&nbsp;!&nbsp;[rejected]&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;master&nbsp;-&gt;&nbsp;master&nbsp;(non-fast-forward)<br>error:&nbsp;failed&nbsp;to&nbsp;push&nbsp;some&nbsp;refs&nbsp;to&nbsp;&#39;ssh://b8ab8a46a2984d16b1666f3b172c4199@appmy-man.rhcloud.com/~/git/appmy.git/&#39;<br>To&nbsp;prevent&nbsp;you&nbsp;from&nbsp;losing&nbsp;history,&nbsp;non-fast-forward&nbsp;updates&nbsp;were&nbsp;rejected<br>Merge&nbsp;the&nbsp;remote&nbsp;changes&nbsp;(e.g.&nbsp;&#39;git&nbsp;pull&#39;)&nbsp;before&nbsp;pushing&nbsp;again.&nbsp;&nbsp;See&nbsp;the<br>&#39;Note&nbsp;about&nbsp;fast-forwards&#39;&nbsp;section&nbsp;of&nbsp;&#39;git&nbsp;push&nbsp;--help&#39;&nbsp;for&nbsp;details.<br><br></span>
<span class="diffaddedchars" style="background-color:#ddfade;">Result:<br></span>
<span class="diffcontext">Thus&nbsp;when&nbsp;trying&nbsp;to&nbsp;publish&nbsp;from&nbsp;tools&nbsp;it&nbsp;should&nbsp;*not*&nbsp;let&nbsp;you&nbsp;push&nbsp;and&nbsp;it&nbsp;should&nbsp;ask&nbsp;you&nbsp;before&nbsp;pushing&nbsp;with&nbsp;force.<br><br>You&nbsp;can&nbsp;verify&nbsp;it&nbsp;did&nbsp;not&nbsp;push&nbsp;force&nbsp;by&nbsp;using&nbsp;<br><br>git&nbsp;pull<br>git&nbsp;log&nbsp;&nbsp;README<br><br>and&nbsp;check&nbsp;that&nbsp;&quot;external&nbsp;change&quot;&nbsp;is&nbsp;still&nbsp;present.</span>

        </td>
    </tr>
                            </table>
                </td>
            </tr>
        </table>
    </td>
</tr>













            </table>
        </td><!-- End #email-page -->
    </tr>
    <tr valign="top">
        <td style="color:#505050;font-family:Arial,FreeSans,Helvetica,sans-serif;font-size:10px;line-height:14px;padding: 0 16px 16px 16px;text-align:center;">
            This message is automatically generated by JIRA.<br />
            If you think it was sent incorrectly, please contact your <a style='color:#003366;' href='https://issues.jboss.org/secure/ContactAdministrators!default.jspa'>JIRA administrators</a>.<br />
            For more information on JIRA, see: <a style='color:#003366;' href='http://www.atlassian.com/software/jira'>http://www.atlassian.com/software/jira</a>
        </td>
    </tr>
</table><!-- End #email-wrap -->
</div><!-- End #email-body -->