git ignore line endings -

-

i know similar questions have been asked, still can't working.

my project shared among people using different operating systems, , i'm on osx. also, not uses git yet , end having commit changes of others.

sometimes, out of git says there pending changes. looking @ files identical:

@@ -1,6 +1,6 @@ -<deployment xmlns="http://schemas.microsoft.com/client/2007/deployment" -        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" -> -    <deployment.parts> -    </deployment.parts> -</deployment> +<deployment xmlns="http://schemas.microsoft.com/client/2007/deployment" +        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" +> +    <deployment.parts> +    </deployment.parts> +</deployment>

i suspect line ending issue.

[edit] 1 external diff tool says: "status: 1 difference line endings differ - left: windows (crlf), right: unix (lf)"

following of online tips, configuration looks like:

[core]     excludesfile = /users/nathanh/.gitignore_global     autocrlf = input     attributesfile = /users/nathanh/.config/git/attributes     whitespace = cr-at-eol

and attributes file:

# ignore differences in line endings *        -crlf

why still showing me files modified?

read jetbrains.com

to have git solve such problems automatically, need set core.autocrlf attribute true on windows , input on linux , os x. more details on meaning of core.autocrlf attribute, see article mind end of line ordealing line endings. can change configuration manually running 

git config --global core.autocrlf true

on windows or 

git config --global core.autocrlf input

on linux , os x. however, intellij idea can analyze configuration, warn if commit crlf repository, , offer set core.autocrlf setting true or input depending on operating system used.

hopefully might shed light on problem.


Comments

Post a Comment

Popular posts from this blog

yii2 - Yii 2 Running a Cron in the basic template -

-
i have seen instructions on running cron in advanced template, cant figure out how on basic template. have following controller in basic controllers folder. <?php namespace app\controllers; use yii\console\controller; /** * cron controller */ class croncontroller extends controller { public function actionindex() { echo "cron service runnning"; } public function actionmail($to) { echo "sending mail " . $to; } } i have navigated root of application , tried these comands yii cron php yii cron im getting unknown comand "cron" i know old question failed find actual answer this. if @ code yii exec file you'll notice requires /common/config/aliases.php file console/config/main.php. can naturally change these or copy on these advanced template. hope solves problem wanting same thing.
Read more

asp.net - 'System.Web.HttpContext' does not contain a definition for 'GetOwinContext' Mystery -

-
i realize question might seem trivial some, it's these types of things find myself fighting quite bit , want make sense of despite seeming losing battle in .net (for me anyway). so, if following: using system.web; ... applicationuser user = system.web.httpcontext.getowincontext().getusermanager<applicationusermanager>().findbyid(system.web.httpcontext.user.identity.getuserid()); that produces error in title , red getowincontext() , error cannot resolve symbol 'getowincontext()' however, if following (remove system.web in front of httpcontext ), works expected (or @ least no errors): using system.web; ... applicationuser user = httpcontext.getowincontext().getusermanager<applicationusermanager>().findbyid(system.web.httpcontext.user.identity.getuserid()); however, if (same line that's working using system.web commented out): //using system.web; ... applicationuser user = httpcontext.getowincontext().getusermana...
Read more

mercurial graft feature, can it copy? -

-
there new feature in mercurial 3, called 'graft' (graft local). job of moving change-set different branch. is there way "copy" change-set branch? i interested in in moving stuff qa branch production branch, still need code reside in qa. want copy. found , have tried few things, maybe it'll become clear more tinkering , reading... does have better way of 'cherry picking' change-sets move cross branch (or trunk)??? graft copies changesets, doesn't move them. hg graft (emphasis mine): this command uses mercurial's merge logic copy individual changes other branches without merging branches in history graph. known 'backporting' or 'cherry-picking' . default, graft copy user, date, , description source changesets.
Read more