Git uncommited changes not commitable -

-

i have weird file after last pull marked not committed , cannot commit it. seems file renamed contactnamefilter.ts -> contactnamefilter.ts on remote.

$ git status  on branch <<...>> branch up-to-date 'origin/<<...>>'. changes not staged commit:   (use "git add <file>..." update committed)   (use "git checkout -- <file>..." discard changes in working directory)      modified:   app/scripts/filters/contactnamefilter.ts  no changes added commit (use "git add" and/or "git commit -a")  $ git commit -a  on branch <<...>> branch up-to-date 'origin/<<...>>'. changes not staged commit:     modified:   app/scripts/filters/contactnamefilter.ts  no changes added commit  $ git add -a $ git commit  on branch <<...>> branch up-to-date 'origin/<<...>>'. changes not staged commit:     modified:   app/scripts/filters/contactnamefilter.ts  no changes added commit

how possible , it?

diff:

-  export var contactnamefilter: function = function(): function { +  export var contactnamefilter: function = function(): function {

try removing file explicitely, , adding again explicitely:

git rm --cached app/scripts/filters/contactnamefilter.ts git add app/scripts/filters/contactnamefilter.ts

this should work if file system makes problems because of case insensitivity.


Comments

Post a Comment

Popular posts from this blog

Android : Making Listview full screen -

-
<linearlayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" tools:context=".mainactivity"> <edittext android:layout_margintop="5dp" android:layout_width="match_parent" android:layout_height="50dp" android:background="@drawable/location_edittext" android:id="@+id/locationeditext" android:textsize="15sp" android:textcolor="#999" android:paddingleft="15dp" /> <com.example.ravi_gupta.slider.viewpagercustomduration android:layout_width="wrap_content" android:layout_height="0dp" android:id="@+id/viewpager" android:scrollbarstyle="outsideoverlay" android:layout_weight="0.5...
Read more

javascript - Parse JSON from the body of the POST -

-
i'm using cameratag.com record video on website. service can send json response server can save data database. don't know how proceed here: the documentation states please note json repsonse passed in body of post , not form parameters. here example of how parse response in ruby: data = json.parse(request.raw_post) video_uuid = data["uuid"] but don't know how data on javascript. i'm not experienced in js please bare me :) post sample: { "uuid": "00012710-4b65-0131-ffe6-22000a499ea4", "camera_uuid": "98373a20-79ee-0130-3e42-1231390fcc11", "created_at": "2013-12-20t05:25:02.000z", "percent_complete": 100, "short_code": "kktb4q", "metadata": { }, "state": "published", "recorded_from": "http://singwho.com", "publish_type": null, "formats": [ { "name...
Read more

javascript - How to Hide Date Menu from Datepicker in yii2 -

-
basically in datetimepicker widget date choose first time, how can hide date option widget , filter according time. tried not working want hide remove button [ 'attribute'=>'time', 'label'=>'time', 'format'=>'raw', 'value'=>function($data){ return date('h:i:s',strtotime($data->time)); }, 'filter'=> datetimepicker::widget([ 'model' => $searchmodel, 'attribute' => 'time', 'clientoptions' => [ 'autoclose' => true, 'format' => 'hh:ii', 'showon' =...
Read more