git - Netbeans wont pull using bitbucket -


i keep getting every time, been happening alot frequently. how fix this. every forum find says type in commands on git... mystery console, cant seem find or people saying.

==[ide]== may 19, 2013 5:24:00 pm pulling... git pull https://bitbucket.org/techreanimate/project +refs/heads/master:refs/remotes/project/master branch  : project/master old id : 6fdea249fc80641a1b3e63174e7dd4ec6b72d84d new id : a19141fea8cbc7a64553b84ed6b591e223384b7a result : fast_forward  merge result: failed merge of head project/master failed because of these files: a:\dev\project\workspace\project-web\.htaccess  ==[ide]== may 19, 2013 5:24:03 pm pulling... finished.

oh, not .htaccess, random files

were mystery console

when plugin using git (like ide netbeans) fails, best fall console.
specifically, separate installation of git, see if reproduce issue.

in windows, instance, download , unzip archive of msysgit portable.

then try git pull working tree, , see exact error message is.

sych emphasizes in comments (after sych's own upvoted answer):

use different git client initialize repo, continue use netbeans

also, make sure can see , access .gitignore , .htaccess (two dotfiles ignored netbeans)

netbeans preferences, go the miscellaneous tab @ top, click on files tab. you’ll see “files ignored ide” section there. 

^(cvs|sccs|vssver.?\.scc|#.*#|%.*%|_svn)$|~$|^\.(?!(htaccess|gitignore)$).*$

that way, can see how git plugin treats files.


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