eclipse - Egit strange behavior when checkout -


i'm starting work egit. i've created initial repository , i've done changes , commits version2. came initial version , changed files , committed changes. did merge conflicts , resulting tree:

enter image description here

the strange thing when checkout 1 branch files appear unstaged (">"). fix reset changes, when checkout branch happens again.

if close eclipse , open repository in git extensions can checkout different branches without problem.

sometimes when want reset changes eclipse remove "ghost changes" can't because conflict dialog reopen again , again when press reset button.

edit: post diff o file.

diff --git a/myapp/res/values/styles.xml b/myapp/res/values/styles.xml index 79a39af..afe1d34 100644 --- a/myapp/res/values/styles.xml +++ b/myapp/res/values/styles.xml @@ -1,13 +1,13 @@  <resources>       <!-- -        base application theme, dependent on api level. theme replaced +        base application theme, dependent on api level. theme replaced          appbasetheme res/values-vxx/styles.xml on newer devices.      -->      <style name="appbasetheme" parent="android:theme.light">          <!-- -            theme customizations available in newer api levels can go in -            res/values-vxx/styles.xml, while customizations related +            theme customizations available in newer api levels can go in +            res/values-vxx/styles.xml, while customizations related              backward-compatibility can go here.          -->      </style>

it's seems differences when there crlf.

if core.autocrlf set true, recommend (as do) set false, , limit end-of-line conversion core.eol directives in .gitattributes files.

once core.autocrlf set false, can check if going 1 branch still makes "ghost changes".


Comments

Post a Comment

Popular posts from this blog

SPSS keyboard combination alters encoding -

my question not have programming practical issue on spss. accident keyword combination cannot remember because did not intend press changed encoding in spss , text in data in different language english shown small boxes. nevertheless, when kind of analysis performed different language text shown in output. does know reason? tried change encoding did not produce result. first, @ edit > options , see whether setting unicode or locale. might fix it. if have text in multiple languages, want unicode. otherwise, may have specific locale set wrong. can change set locale, need know locale want use.
Read more

Add new record to the table by click on the button in Microsoft Access -

in ms access form want implement separate button, adds new record table. in order added button , attached button event: private sub btnaddrec_click() refresh codecontextobject on error resume next docmd.gotorecord , , acnewrec if err.number <> 0 btnaddrec.enabled = false end if end end sub everything ok when open window , click btnaddrec button, problem when first of perform navigation through existed records , after click on button. got runtime error: 2105: «you can't go specified record. may @ end of recordset» . how solve issue, need have ability add new record on click on specific button, no matter, have walked or not walked through records before. thanks. i created simple form field call description (and autonumber) , created button code follows click event. filled number of records , navigated through them, clicked addnewrec button. form navigated new record without issues. able click addnewrec button directly after
Read more

javascript - jQuery .height() return 0 when visible but non-0 when hidden -

i have problem here right opposite others: in jquery cannot height of element when it's visible, when hidden. have html code: <div id="filtering-filter-holder"> <div id="filtering-filter-holder-inner"></div> </div> basic css it: #filtering-filter-holder { display: none; position: absolute; width: 420px; min-height: 100px; padding: 5px 5px 5px 5px; background-color: #ffffff; border: 1px solid #164372; } and finally, js in document.ready(): $('div.filtering-filter-headline').mouseenter(function() { var el = $(this).parent().find('div.filtering-filter-content'); if ($('div#filtering-filter-holder').is(':visible')) { $('div#filtering-filter-holder-inner').stop(true, true).fadeout(300, function() { $('div#filtering-filter-holder-inner').html($(el).html()); var height = $('div#filtering-filter-holder-inner&#
Read more