Cant discard file changes in GIT -



Cant discard file changes in GIT -

i faced problem, can't discard changes file. in diff showed lines deleted , new pasted. content of file similar initial commit in branch. intellij thought shows there no diff repository.

i new 1 git, please patient)

my best guess happening on windows machine, , somewhere in .gitattributes file have directive tells git perform line ending normalizations (via * text=auto or similar). if indeed case, when checkout file lfs converted crlfs, , when commit file crlfs converted lfs.

if indeed case, happening repository version of files in question somehow have crlfs in them. when check them out, working copies of course of study have crlfs. here's rub: when doing git status, git diff, etc. git compares in repo/index not in working directory, would committed after line ending normalization done, i.e. crlfs replaced lfs. in case, git sees in index/repo has crlfs, , would commit has lfs, , there difference.

to see if case, run next commands:

git hash-object path/to/filename git hash-object --no-filter path/to/filename git ls-files -s path/to/filename

the first command show hash of would committed. sec command shows hash of in working directory. 3rd command shows hash of in index. if first , sec hashes different, , sec , 3rd hashes same, in situation have described.

so question is, how out of it? 1 simple way add/commit "changes". have effect of putting lfs in repository copy, solving problem going forward. if using repository on windows, however, there no need line normalizations anyway. can disable them putting * -text in .gitattributes file (and removing lines below sets type of file text). that's alternative chose when ran problem, i'm not fan of version command scheme changing contents of files.

git

Comments

Post a Comment

Popular posts from this blog

xslt - DocBook 5 to PDF transform failing with error: "fo:flow" is missing child elements. Required content model: marker* -

xslt - DocBook 5 to PDF transform failing with error: "fo:flow" is missing child elements. Required content model: marker* - i've inherited doc publishing process takes docbook , builds html , pdf output, using apache fop both. project had been started, never completed. lots of tweaking, i've able of doc sets build (20+), except handful, , fail severe code 1 of these 2 conditions: "fo:flow" missing kid elements. required content model: marker* "fo:block" not valid kid of "fo:root" the xml output comes out of docbook , docbook-fop checks out well-formed. the fop error in 1 book, "endecagloss", example, points end of string: <fo:flow flow-name="xsl-region-body" start-indent="4pc" end-indent="0pt"/> here’s log output in case: [java] severe: javax.xml.transform.transformerexception: file:/scratch/publishing/hudson/jobs/build-main-endeca-documentation/workspace/serverdoc/w...
Read more

mediawiki - How do I insert tables inside infoboxes on Wikia pages? -

mediawiki - How do I insert tables inside infoboxes on Wikia pages? - i want insert tables in infoboxes. example, have proteinbox i've developed using infobox template (http://health-and-medicine.wikia.com/wiki/template:proteinbox), , fasta field big fit comfortably in proteinbox. hence collapsible table within box. this tried: {{infobox | row 1 = {| class = "mw-collapsible mw-collapsed wikitable" |- | <!-- table content --> |} }} your problem is, putting nested table within template. pipe characters ( | ) in table syntax collides pipe usage in templates. the commonly used hack around create template called template:! , containing pipe character, , utilize when need set tables, parser functions or other stuff using pipe characters, within templates. table (with every | replaced {{!}} ): {{{!}} {{!}}- {{!}} a1 {{!}} b1 {{!}}- {{!}} a2 {{!}} b2 {{!}}} ...the equivalent of {| |- | a1 | b1 |- | a2 | b2 |} furthermore, hav...
Read more

Local Service User Logged into Windows -

Local Service User Logged into Windows - i created windows service tracks app server user connected through load balancer. it retrieves user logged windows on machine, cross references active directory (ad) business relationship homecoming first name, lastly name , e-mail (for notification through website created project) there 1 scheme on network users remote system, vista system, reason returning values "local service" logged machine, it's weird , security guys impossible "local service" business relationship logged windows. here how user logged windows managementscope ms = new managementscope("\\\\.\\root\\cimv2"); objectquery query = new objectquery("select * win32_computersystem"); managementobjectsearcher searcher = new managementobjectsearcher(ms, query); foreach (managementobject mo in searcher.get()) { _username = mo["username"].tostring(); } // remove domain part username string[] usernameparts = _...
Read more