Git force overwrite of local tracked files but not local untracked files -


i working in local directory named p1 contains git repo. after adding branch , making commit on added branch, made copy of directory p1 , called p2. intention play around merging , rebasing (just learn) in directory p2, while pushing remote repo p1 when determined how wanted merge/rebase changes.

however, accidentally did merging , pushed remote repo p2 directory. ok, because remote repo has correct state of git project.

however, need replace what's in directory p1 what's in remote repo. way, directory p1 up-to-date.

when go directory p1 , try pull remote repo, here get:

git pull updating e07d50d..287ec08 error: local changes following files overwritten merge:     debug/external/subdir.mk     debug/makefile     debug/subdir.mk     input/parameters.cfg     main.cpp please, commit changes or stash them before can merge. aborting

now, have found potential solutions problem, such this.

the problem in case, however, directory p2 contains untracked files not want deleted when pull remote repo.

so, how can pull remote repo, overwriting local tracked files, without deleting local untracked files?

note: 1 of answers here seems appropriate me, i'm not 100% certain.

git fetch git reset --hard origin/master

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