When are changes locally merged with `git checkout`? -

-

  1. suppose on master branch. there file in working directory called "master.txt" contains single text line "asdf".

  2. suppose git checkout f364f96d34fb2af20dbd8cccd91a83a1e277bcfe, takes me older commit on master branch head.

  3. i edit file "master.txt" (which still, @ point, has line "asdf") deleting line "asdf".

  4. i git checkout master.

  5. it appears master.txt still empty (i.e., no "asdf)!

question: way things supposed work? reading textbook on git, thought changes locally merged on git checkout if no conflicts arose. deleting "asdf" creates conflict, no?

when checkout commit without specifying paths, working tree updated match contents of tree of commit, current index (cache/staging area) left unchanged.

what see extension of behavior: if don't add change index, git reapply on top of new working tree don't lose it.

you can checkout head path of file remove change, or add index , commit it.

the reference documentation mentions "conflicts" occur if have local modifications on file different in trees of head , of target commit. in case, both versions of master.txt file contain asdf, working tree has empty. hence, there no conflict.

if add commit master.txt containing foo, checkout commit master.txt having asdf , same operations described, git prevent subsequently checking out second commit again.


Comments

Post a Comment

Popular posts from this blog

html - Firefox flex bug applied to buttons? -

-
i'm trying apply flex button on firefox i'm having problem on chrome doesn't happens. this css: .button { display: inline-flex; align-items: center; } as can see in fiddle, "caret" word moved new line, happens if element <button> tag, <div> works expected. http://codepen.io/anon/pen/xblmgx is firefox bug or there css i'm missing? nevermind, looks "mr firefox" doesn't idea... <button> not implementable (by browsers) in pure css, bit of black box, perspective of css. means don't react in same way e.g. <div> would. this isn't specific flexbox -- e.g. don't render scrollbars if put "overflow:scroll" on button, , don't render table if put "display:table" on it. stepping further, isn't specific <button> . consider <fieldset> , <table> have special rendering behavior: data:text/html,<fieldset style="d...
Read more

html - Missing border-right in select on Firefox -

-
Image
when put select div width , padding-left, options have no border on right. more, happend if select have width 118px , parent have 15px of padding left! have idea, going on? my code: <!doctype html> <html> <head lang="en"> </head> <body> <div style="width: 1000px; padding-left: 15px;"> <select style="width: 118px;"> <option>a</option> <option>b</option> <option>c</option> </select> </div> </body> </html> and result: here plunker: click it happend on firefox on windows. tested on 40.0.2 version -webkit-box-sizing: border-box; -moz-box-sizing: border-box; -ms-box-sizing: border-box; box-sizing: border-box; source: https://stackoverflow.com/a/11390432/4431269 source of problem: https://bugzilla.mozilla.org/show_bug.cgi?id=924068 and use of google ! edit: (source of problem, explained) after rea...
Read more

python - build a suggestions list using fuzzywuzzy -

-
i building suggestion engine database. i'm using fuzzywuzzy module match user input string existing database shown below. if request.method == "get": display_dict = {} user_input = request.get["user_input"] # user input match_dict = {} food_items_obj = food_items.objects.all() # fetch objects table items in food_items_obj : match = fuzz.ratio(user_input.lower(),items.name.lower()) # try match user input existing names match_dict[match] = items.name # put 1 dictionary matched_dict = ordereddict(sorted(match_dict.items(),reverse = true)) # sort dictionary if max(matched_dict.keys()) == 100: # if exact match put in dict , return display_dict[100] = matched_dict[100] else : # if not found try best matching words.. ###########this part need help! ############# k,v in matched_dict.items(): if user_input in v : display_dict[k]...
Read more