Github DETACHED HEAD error when working with another developer -


a developer , working on using .gitignore add conditions c# projects , solutions committing, since encountered issue of being unable commit result of committing binaries (such .suo) github well, caused conflicts.

we fixed issue of .gitignore, ignores number of conditions. however, when went computer, getting detached head error. did git status, , command line has been giving me these messages.

i unsure how solve issue. wondering can/should can go master , commit/sync changes?

also, how prevent issue in future?

http://puu.sh/6ey9d/ae25db08b9.png

  1. i in rebase, ran git rebase --abort out of that.

  2. afterwards in master, allowed me commit again.


-

Comments

Post a Comment

Popular posts from this blog

php - regexp cyrillic filename not matches -

i take list of files php glob(."*.pdf") . files have cyrillic names. example: ООО «Рога и копыта» then load company names database , try find them in file names: preg_match("/$firm_name/ui", $file_name, $match); i have problem: firms if $firm_name visually similar $file_name , preg_match says there no match. mb_detect_encoding both variables return utf-8. there problem in file name, or maybe there encoding or something, can not understand, ask help. upd: $file_name='ООО «Рога и копыта»'; preg_match("/... .Рога и копыта./ui", $file_name, $match); as result, ОО «Рога и копыта» , 1 О missing
Read more

c# - OpenXML hanging while writing elements -

Image
i have program pulls data database, caches file , exports data multiple formats (excel, excel 2003, csv). i'm using openxml sdk 2.0 excel work. these export processes run in parallel (using parallel.foreach ), , amount of data can pretty large - e.g. csvs 800mb. during these larger exports, i've noticed writing of xml documents hang. instance, if have 8 exporting in parallel, @ point "pause". hang around same point: //this.writer openxmlwriter created worksheetpart. this.writer.writeelement(new cell() { cellvalue = new cellvalue(value), datatype = cellvalues.string }); when happens, pause debugger (vs2013 in case) , notice threads blocking around same portion of code - bit deeper in openxml sdk - stem call openxmlwriter.writeelement . i dug through source using justdecompile didn't find answers. appears there intermediary stream in use writing isolated storage , is, reason, blocking. underlying stream each of these filestream . here screenshot ...
Read more

python - Scapy Dot11ReassoReq -

what scapy's dot11reassoreq, , do? sound ideal purposes: want make tool (among other things) searches hidden aps. code far: def tickle(*args,**kwargs): packs1=[] packs2=[] client in appinstance.sframe.interior.clients.copy(): pkt=dot11(addr1="ff:ff:ff:ff:ff:ff",addr2=client,addr3=client)/\ dot11deauth() packs1.append(pkt) client in appinstance.sframe.interior.clients.copy(): pkt=dot11(addr1="ff:ff:ff:ff:ff:ff",addr2=client,addr3=client)/\ dot11reassoreq(current_ap=client) packs2.append(pkt) packs1*=32 shuffle(packs1) packs2*=32 shuffle(packs2) packs=packs1+packs2 appinstance.stopprogressbar() appinstance.startprogressbardet(len(packs), "trying expose hidden ap's") pkt in packs: send(pkt,verbose=0) appinstance.progressbar.step() appinstance.stopprogressbar() however, wireshark re...
Read more