Mixing
Git diff is not working as expected in Android Studio?
0
In my Android Studio, changing a text in some line shows the whole file in the diff. Previously this worked properly; now it doesn't work.
I made multiple changes in settings so I can't identify whats the culprit. I have added my own formatter in Android Studio -- don't know if that is causing the problem.
Below I have attached sample git diff output:
@@ -1 +1 @@
-package com.gyanapp.Base;^Mimport android.os.Bundle;^Mimport android.support.annotation.Nullable;^Mimport com.AppVersionModel;^Mimport com.OTPApi;^Mimport com.gyanapp.Screens.ForceUpgrade.Forc
eUpgradeScreen;^Mimport com.gyanapp.Utils.DeviceUtils;^Mimport com.gyanapp.Utils.NetWorkUtil;^Mimport io.reactivex.android.schedulers.AndroidSchedulers;^Mimport io.reactivex.observers.Disposabl
eObserver;^Mimport io.reactivex.schedulers.Schedulers;^M/**^M * Created by Utkarsh Shukla on 03/11/18.^M */^Mpublic abstract class BaseForceUpdradeCheck extends BaseActivity {^M @Override^M
public abstract void logScreenFlowEventForAnalytics() ;^M @Override^M protected void onCreate(@Nullable Bundle savedInstanceState) {^M super.onCreate(savedInstanceState);^M
DisposableObserver<AppVersionModel> disposableObserver =^M new DisposableObserver<AppVersionModel>() {^M @Override^M public void onNext(
AppVersionModel appVersionModel) {^M if (DeviceUtils.requireForceUpgrade(appVersionModel)) {^M startActivity(ForceUpgradeScreen.createIntent(Ba
seForceUpdradeCheck.this));^M finish();^M } else {^M continueNormalProcess();^M }^M//
continueNormalProcess();^M }^M @Override^M public void onError(Throwable e) {^M }^M @Override^M public void onComplete() {^M }^M };^M DisposableObserver<AppVersionModel> homeResponseDisposableObserver =^M NetWorkUtil.provideRetrofit().create(OTPApi.class).checkAppVersion()^M .subscribeOn(Schedulers^M .io())^M .observeOn(AndroidSchedulers.mainThread())^M .subscribeWith(disposableObserver);^M }^M protected abstract void continueNormalProcess();^M}
No newline at end of file
+package com.gyanapp.Base;^Mimport android.os.Bundle;^Mimport android.support.annotation.Nullable;^Mimport com.AppVersionModel;^Mimport com.OTPApi;^Mimport com.google.firebase.perf.FirebasePerformance;^Mimport com.google.firebase.perf.metrics.Trace;^Mimport com.gyanapp.Screens.ForceUpgrade.ForceUpgradeScreen;^Mimport com.gyanapp.Utils.Config;^Mimport com.gyanapp.Utils.DeviceUtils;^Mimport com.gyanapp.Utils.NetWorkUtil;^Mimport io.reactivex.android.schedulers.AndroidSchedulers;^Mimport io.reactivex.observers.DisposableObserver;^Mimport io.reactivex.schedulers.Schedulers;^M/**^M * Created by Utkarsh Shukla on 03/11/18.^M */^Mpublic abstract class BaseForceUpdradeCheck extends BaseActivity {^M @Override^M public abstract void logScreenFlowEventForAnalytics() ;^M @Override^M protected void onCreate(@Nullable Bundle savedInstanceState) {^M super.onCreate(savedInstanceState);^M Trace myTrace = FirebasePerformance.getInstance().newTrace(Config.TRACE.SPLASH_FORCE_UPGRADE_CHECK_CALL);^M myTrace.start();^M DisposableObserver<AppVersionModel> disposableObserver =^M new DisposableObserver<AppVersionModel>() {^M @Override^M public void onNext(AppVersionModel appVersionModel) {^M myTrace.incrementMetric(Config.TRACE.SPLASH_FORCE_UPGRADE_CHECK_CALL_SUCCESS,1);^M myTrace.stop();^M if (DeviceUtils.requireForceUpgrade(appVersionModel)) {^M startActivity(ForceUpgradeScreen.createIntent(BaseForceUpdradeCheck.this));^M finish();^M } else {^M continueNormalProcess();
^M }^M }^M @Override^M public void onError(Throwable e) {^M myTrace.incrementMetric(Config.TRACE.SPLASH_FORCE_UPGRADE_CHECK_CALL_ERROR,1);^M myTrace.stop();^M }^M @Override^M public void onComplete() {^M^M }^M };^M DisposableObserver<AppVersionModel> homeResponseDisposableObserver =^M NetWorkUtil.provideRetrofit().create(OTPApi.class).checkAppVersion()^M .subscribeOn(Schedulers^M .io())^M .observeOn(AndroidSchedulers.mainThread())^M .subscribeWith(disposableObserver);^M }^M protected abstract void continueNormalProcess();^M}^M
No newline at end of file
What's ˆM? What is No newline at end of file?
Tried this but did not work
git
android-studio edited Jan 23 at 11:45
Bhargav Rao♦
30.5k2091112
asked Nov 22 '18 at 7:13
JSONParserJSONParser
6241923
add a comment |
0
In my Android Studio, changing a text in some line shows the whole file in the diff. Previously this worked properly; now it doesn't work.
I made multiple changes in settings so I can't identify whats the culprit. I have added my own formatter in Android Studio -- don't know if that is causing the problem.
Below I have attached sample git diff output:
@@ -1 +1 @@
-package com.gyanapp.Base;^Mimport android.os.Bundle;^Mimport android.support.annotation.Nullable;^Mimport com.AppVersionModel;^Mimport com.OTPApi;^Mimport com.gyanapp.Screens.ForceUpgrade.Forc
eUpgradeScreen;^Mimport com.gyanapp.Utils.DeviceUtils;^Mimport com.gyanapp.Utils.NetWorkUtil;^Mimport io.reactivex.android.schedulers.AndroidSchedulers;^Mimport io.reactivex.observers.Disposabl
eObserver;^Mimport io.reactivex.schedulers.Schedulers;^M/**^M * Created by Utkarsh Shukla on 03/11/18.^M */^Mpublic abstract class BaseForceUpdradeCheck extends BaseActivity {^M @Override^M
public abstract void logScreenFlowEventForAnalytics() ;^M @Override^M protected void onCreate(@Nullable Bundle savedInstanceState) {^M super.onCreate(savedInstanceState);^M
DisposableObserver<AppVersionModel> disposableObserver =^M new DisposableObserver<AppVersionModel>() {^M @Override^M public void onNext(
AppVersionModel appVersionModel) {^M if (DeviceUtils.requireForceUpgrade(appVersionModel)) {^M startActivity(ForceUpgradeScreen.createIntent(Ba
seForceUpdradeCheck.this));^M finish();^M } else {^M continueNormalProcess();^M }^M//
continueNormalProcess();^M }^M @Override^M public void onError(Throwable e) {^M }^M @Override^M public void onComplete() {^M }^M };^M DisposableObserver<AppVersionModel> homeResponseDisposableObserver =^M NetWorkUtil.provideRetrofit().create(OTPApi.class).checkAppVersion()^M .subscribeOn(Schedulers^M .io())^M .observeOn(AndroidSchedulers.mainThread())^M .subscribeWith(disposableObserver);^M }^M protected abstract void continueNormalProcess();^M}
No newline at end of file
+package com.gyanapp.Base;^Mimport android.os.Bundle;^Mimport android.support.annotation.Nullable;^Mimport com.AppVersionModel;^Mimport com.OTPApi;^Mimport com.google.firebase.perf.FirebasePerformance;^Mimport com.google.firebase.perf.metrics.Trace;^Mimport com.gyanapp.Screens.ForceUpgrade.ForceUpgradeScreen;^Mimport com.gyanapp.Utils.Config;^Mimport com.gyanapp.Utils.DeviceUtils;^Mimport com.gyanapp.Utils.NetWorkUtil;^Mimport io.reactivex.android.schedulers.AndroidSchedulers;^Mimport io.reactivex.observers.DisposableObserver;^Mimport io.reactivex.schedulers.Schedulers;^M/**^M * Created by Utkarsh Shukla on 03/11/18.^M */^Mpublic abstract class BaseForceUpdradeCheck extends BaseActivity {^M @Override^M public abstract void logScreenFlowEventForAnalytics() ;^M @Override^M protected void onCreate(@Nullable Bundle savedInstanceState) {^M super.onCreate(savedInstanceState);^M Trace myTrace = FirebasePerformance.getInstance().newTrace(Config.TRACE.SPLASH_FORCE_UPGRADE_CHECK_CALL);^M myTrace.start();^M DisposableObserver<AppVersionModel> disposableObserver =^M new DisposableObserver<AppVersionModel>() {^M @Override^M public void onNext(AppVersionModel appVersionModel) {^M myTrace.incrementMetric(Config.TRACE.SPLASH_FORCE_UPGRADE_CHECK_CALL_SUCCESS,1);^M myTrace.stop();^M if (DeviceUtils.requireForceUpgrade(appVersionModel)) {^M startActivity(ForceUpgradeScreen.createIntent(BaseForceUpdradeCheck.this));^M finish();^M } else {^M continueNormalProcess();
^M }^M }^M @Override^M public void onError(Throwable e) {^M myTrace.incrementMetric(Config.TRACE.SPLASH_FORCE_UPGRADE_CHECK_CALL_ERROR,1);^M myTrace.stop();^M }^M @Override^M public void onComplete() {^M^M }^M };^M DisposableObserver<AppVersionModel> homeResponseDisposableObserver =^M NetWorkUtil.provideRetrofit().create(OTPApi.class).checkAppVersion()^M .subscribeOn(Schedulers^M .io())^M .observeOn(AndroidSchedulers.mainThread())^M .subscribeWith(disposableObserver);^M }^M protected abstract void continueNormalProcess();^M}^M
No newline at end of file
What's ˆM? What is No newline at end of file?
Tried this but did not work
git
android-studio edited Jan 23 at 11:45
Bhargav Rao♦
30.5k2091112
asked Nov 22 '18 at 7:13
JSONParserJSONParser
6241923
Without better formatting your diff snippet is hard to read.
– Werner Henze
Nov 22 '18 at 7:38
@WernerHenze having the same issue
– JSONParser
Nov 22 '18 at 7:39
add a comment |
0
0
0
In my Android Studio, changing a text in some line shows the whole file in the diff. Previously this worked properly; now it doesn't work.
I made multiple changes in settings so I can't identify whats the culprit. I have added my own formatter in Android Studio -- don't know if that is causing the problem.
Below I have attached sample git diff output:
@@ -1 +1 @@
-package com.gyanapp.Base;^Mimport android.os.Bundle;^Mimport android.support.annotation.Nullable;^Mimport com.AppVersionModel;^Mimport com.OTPApi;^Mimport com.gyanapp.Screens.ForceUpgrade.Forc
eUpgradeScreen;^Mimport com.gyanapp.Utils.DeviceUtils;^Mimport com.gyanapp.Utils.NetWorkUtil;^Mimport io.reactivex.android.schedulers.AndroidSchedulers;^Mimport io.reactivex.observers.Disposabl
eObserver;^Mimport io.reactivex.schedulers.Schedulers;^M/**^M * Created by Utkarsh Shukla on 03/11/18.^M */^Mpublic abstract class BaseForceUpdradeCheck extends BaseActivity {^M @Override^M
public abstract void logScreenFlowEventForAnalytics() ;^M @Override^M protected void onCreate(@Nullable Bundle savedInstanceState) {^M super.onCreate(savedInstanceState);^M
DisposableObserver<AppVersionModel> disposableObserver =^M new DisposableObserver<AppVersionModel>() {^M @Override^M public void onNext(
AppVersionModel appVersionModel) {^M if (DeviceUtils.requireForceUpgrade(appVersionModel)) {^M startActivity(ForceUpgradeScreen.createIntent(Ba
seForceUpdradeCheck.this));^M finish();^M } else {^M continueNormalProcess();^M }^M//
continueNormalProcess();^M }^M @Override^M public void onError(Throwable e) {^M }^M @Override^M public void onComplete() {^M }^M };^M DisposableObserver<AppVersionModel> homeResponseDisposableObserver =^M NetWorkUtil.provideRetrofit().create(OTPApi.class).checkAppVersion()^M .subscribeOn(Schedulers^M .io())^M .observeOn(AndroidSchedulers.mainThread())^M .subscribeWith(disposableObserver);^M }^M protected abstract void continueNormalProcess();^M}
No newline at end of file
+package com.gyanapp.Base;^Mimport android.os.Bundle;^Mimport android.support.annotation.Nullable;^Mimport com.AppVersionModel;^Mimport com.OTPApi;^Mimport com.google.firebase.perf.FirebasePerformance;^Mimport com.google.firebase.perf.metrics.Trace;^Mimport com.gyanapp.Screens.ForceUpgrade.ForceUpgradeScreen;^Mimport com.gyanapp.Utils.Config;^Mimport com.gyanapp.Utils.DeviceUtils;^Mimport com.gyanapp.Utils.NetWorkUtil;^Mimport io.reactivex.android.schedulers.AndroidSchedulers;^Mimport io.reactivex.observers.DisposableObserver;^Mimport io.reactivex.schedulers.Schedulers;^M/**^M * Created by Utkarsh Shukla on 03/11/18.^M */^Mpublic abstract class BaseForceUpdradeCheck extends BaseActivity {^M @Override^M public abstract void logScreenFlowEventForAnalytics() ;^M @Override^M protected void onCreate(@Nullable Bundle savedInstanceState) {^M super.onCreate(savedInstanceState);^M Trace myTrace = FirebasePerformance.getInstance().newTrace(Config.TRACE.SPLASH_FORCE_UPGRADE_CHECK_CALL);^M myTrace.start();^M DisposableObserver<AppVersionModel> disposableObserver =^M new DisposableObserver<AppVersionModel>() {^M @Override^M public void onNext(AppVersionModel appVersionModel) {^M myTrace.incrementMetric(Config.TRACE.SPLASH_FORCE_UPGRADE_CHECK_CALL_SUCCESS,1);^M myTrace.stop();^M if (DeviceUtils.requireForceUpgrade(appVersionModel)) {^M startActivity(ForceUpgradeScreen.createIntent(BaseForceUpdradeCheck.this));^M finish();^M } else {^M continueNormalProcess();
^M }^M }^M @Override^M public void onError(Throwable e) {^M myTrace.incrementMetric(Config.TRACE.SPLASH_FORCE_UPGRADE_CHECK_CALL_ERROR,1);^M myTrace.stop();^M }^M @Override^M public void onComplete() {^M^M }^M };^M DisposableObserver<AppVersionModel> homeResponseDisposableObserver =^M NetWorkUtil.provideRetrofit().create(OTPApi.class).checkAppVersion()^M .subscribeOn(Schedulers^M .io())^M .observeOn(AndroidSchedulers.mainThread())^M .subscribeWith(disposableObserver);^M }^M protected abstract void continueNormalProcess();^M}^M
No newline at end of file
What's ˆM? What is No newline at end of file?
Tried this but did not work
git
android-studio edited Jan 23 at 11:45
Bhargav Rao♦
30.5k2091112
asked Nov 22 '18 at 7:13
JSONParserJSONParser
6241923
In my Android Studio, changing a text in some line shows the whole file in the diff. Previously this worked properly; now it doesn't work.
I made multiple changes in settings so I can't identify whats the culprit. I have added my own formatter in Android Studio -- don't know if that is causing the problem.
Below I have attached sample git diff output:
@@ -1 +1 @@
-package com.gyanapp.Base;^Mimport android.os.Bundle;^Mimport android.support.annotation.Nullable;^Mimport com.AppVersionModel;^Mimport com.OTPApi;^Mimport com.gyanapp.Screens.ForceUpgrade.Forc
eUpgradeScreen;^Mimport com.gyanapp.Utils.DeviceUtils;^Mimport com.gyanapp.Utils.NetWorkUtil;^Mimport io.reactivex.android.schedulers.AndroidSchedulers;^Mimport io.reactivex.observers.Disposabl
eObserver;^Mimport io.reactivex.schedulers.Schedulers;^M/**^M * Created by Utkarsh Shukla on 03/11/18.^M */^Mpublic abstract class BaseForceUpdradeCheck extends BaseActivity {^M @Override^M
public abstract void logScreenFlowEventForAnalytics() ;^M @Override^M protected void onCreate(@Nullable Bundle savedInstanceState) {^M super.onCreate(savedInstanceState);^M
DisposableObserver<AppVersionModel> disposableObserver =^M new DisposableObserver<AppVersionModel>() {^M @Override^M public void onNext(
AppVersionModel appVersionModel) {^M if (DeviceUtils.requireForceUpgrade(appVersionModel)) {^M startActivity(ForceUpgradeScreen.createIntent(Ba
seForceUpdradeCheck.this));^M finish();^M } else {^M continueNormalProcess();^M }^M//
continueNormalProcess();^M }^M @Override^M public void onError(Throwable e) {^M }^M @Override^M public void onComplete() {^M }^M };^M DisposableObserver<AppVersionModel> homeResponseDisposableObserver =^M NetWorkUtil.provideRetrofit().create(OTPApi.class).checkAppVersion()^M .subscribeOn(Schedulers^M .io())^M .observeOn(AndroidSchedulers.mainThread())^M .subscribeWith(disposableObserver);^M }^M protected abstract void continueNormalProcess();^M}
No newline at end of file
+package com.gyanapp.Base;^Mimport android.os.Bundle;^Mimport android.support.annotation.Nullable;^Mimport com.AppVersionModel;^Mimport com.OTPApi;^Mimport com.google.firebase.perf.FirebasePerformance;^Mimport com.google.firebase.perf.metrics.Trace;^Mimport com.gyanapp.Screens.ForceUpgrade.ForceUpgradeScreen;^Mimport com.gyanapp.Utils.Config;^Mimport com.gyanapp.Utils.DeviceUtils;^Mimport com.gyanapp.Utils.NetWorkUtil;^Mimport io.reactivex.android.schedulers.AndroidSchedulers;^Mimport io.reactivex.observers.DisposableObserver;^Mimport io.reactivex.schedulers.Schedulers;^M/**^M * Created by Utkarsh Shukla on 03/11/18.^M */^Mpublic abstract class BaseForceUpdradeCheck extends BaseActivity {^M @Override^M public abstract void logScreenFlowEventForAnalytics() ;^M @Override^M protected void onCreate(@Nullable Bundle savedInstanceState) {^M super.onCreate(savedInstanceState);^M Trace myTrace = FirebasePerformance.getInstance().newTrace(Config.TRACE.SPLASH_FORCE_UPGRADE_CHECK_CALL);^M myTrace.start();^M DisposableObserver<AppVersionModel> disposableObserver =^M new DisposableObserver<AppVersionModel>() {^M @Override^M public void onNext(AppVersionModel appVersionModel) {^M myTrace.incrementMetric(Config.TRACE.SPLASH_FORCE_UPGRADE_CHECK_CALL_SUCCESS,1);^M myTrace.stop();^M if (DeviceUtils.requireForceUpgrade(appVersionModel)) {^M startActivity(ForceUpgradeScreen.createIntent(BaseForceUpdradeCheck.this));^M finish();^M } else {^M continueNormalProcess();
^M }^M }^M @Override^M public void onError(Throwable e) {^M myTrace.incrementMetric(Config.TRACE.SPLASH_FORCE_UPGRADE_CHECK_CALL_ERROR,1);^M myTrace.stop();^M }^M @Override^M public void onComplete() {^M^M }^M };^M DisposableObserver<AppVersionModel> homeResponseDisposableObserver =^M NetWorkUtil.provideRetrofit().create(OTPApi.class).checkAppVersion()^M .subscribeOn(Schedulers^M .io())^M .observeOn(AndroidSchedulers.mainThread())^M .subscribeWith(disposableObserver);^M }^M protected abstract void continueNormalProcess();^M}^M
No newline at end of file
What's ˆM? What is No newline at end of file?
Tried this but did not work
git
android-studio git
android-studio edited Jan 23 at 11:45
Bhargav Rao♦
30.5k2091112
asked Nov 22 '18 at 7:13
JSONParserJSONParser
6241923
edited Jan 23 at 11:45
Bhargav Rao♦
30.5k2091112
asked Nov 22 '18 at 7:13
JSONParserJSONParser
6241923
edited Jan 23 at 11:45
Bhargav Rao♦
30.5k2091112
edited Jan 23 at 11:45
Bhargav Rao♦
30.5k2091112
edited Jan 23 at 11:45
Bhargav Rao♦
30.5k2091112
30.5k2091112
asked Nov 22 '18 at 7:13
JSONParserJSONParser
6241923
asked Nov 22 '18 at 7:13
JSONParserJSONParser
6241923
asked Nov 22 '18 at 7:13
JSONParserJSONParser
6241923
6241923
Without better formatting your diff snippet is hard to read.
– Werner Henze
Nov 22 '18 at 7:38
@WernerHenze having the same issue
– JSONParser
Nov 22 '18 at 7:39
add a comment |
Without better formatting your diff snippet is hard to read.
– Werner Henze
Nov 22 '18 at 7:38
@WernerHenze having the same issue
– JSONParser
Nov 22 '18 at 7:39
Without better formatting your diff snippet is hard to read.
– Werner Henze
Nov 22 '18 at 7:38
Without better formatting your diff snippet is hard to read.
– Werner Henze
Nov 22 '18 at 7:38
@WernerHenze having the same issue
– JSONParser
Nov 22 '18 at 7:39
@WernerHenze having the same issue
– JSONParser
Nov 22 '18 at 7:39
add a comment |
1 Answer
1
active
oldest
votes
0
There was an option to change the Line separator in Android Studio on the bottom right. See attached photo below.
In some formatting I had mistakingly changed the line separator to CR and committed. Then the ˆM problem appeared in every file I committed.
I changed the option to LF and committed every file again and now it is resolved.
edited Jan 23 at 10:11
tripleee
93.1k13130184
answered Dec 20 '18 at 11:15
JSONParserJSONParser
6241923
add a comment |
Your Answer
StackExchange.ifUsing("editor", function () {
StackExchange.using("externalEditor", function () {
StackExchange.using("snippets", function () {
StackExchange.snippets.init();
});
});
}, "code-snippets");
StackExchange.ready(function() {
var channelOptions = {
tags: "".split(" "),
id: "1"
};
initTagRenderer("".split(" "), "".split(" "), channelOptions);
StackExchange.using("externalEditor", function() {
// Have to fire editor after snippets, if snippets enabled
if (StackExchange.settings.snippets.snippetsEnabled) {
StackExchange.using("snippets", function() {
createEditor();
});
}
else {
createEditor();
}
});
function createEditor() {
StackExchange.prepareEditor({
heartbeatType: 'answer',
autoActivateHeartbeat: false,
convertImagesToLinks: true,
noModals: true,
showLowRepImageUploadWarning: true,
reputationToPostImages: 10,
bindNavPrevention: true,
postfix: "",
imageUploader: {
brandingHtml: "Powered by u003ca class="icon-imgur-white" href="https://imgur.com/"u003eu003c/au003e",
contentPolicyHtml: "User contributions licensed under u003ca href="https://creativecommons.org/licenses/by-sa/3.0/"u003ecc by-sa 3.0 with attribution requiredu003c/au003e u003ca href="https://stackoverflow.com/legal/content-policy"u003e(content policy)u003c/au003e",
allowUrls: true
},
onDemand: true,
discardSelector: ".discard-answer"
,immediatelyShowMarkdownHelp:true
});
}
});
draft saved
draft discarded
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
StackExchange.ready(
function () {
StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f53425617%2fgit-diff-is-not-working-as-expected-in-android-studio%23new-answer', 'question_page');
}
);
Post as a guest
Required, but never shown
1 Answer
1
active
oldest
votes
1 Answer
1
active
oldest
votes
active
oldest
votes
active
oldest
votes
0
There was an option to change the Line separator in Android Studio on the bottom right. See attached photo below.
In some formatting I had mistakingly changed the line separator to CR and committed. Then the ˆM problem appeared in every file I committed.
I changed the option to LF and committed every file again and now it is resolved.
edited Jan 23 at 10:11
tripleee
93.1k13130184
answered Dec 20 '18 at 11:15
JSONParserJSONParser
6241923
add a comment |
0
There was an option to change the Line separator in Android Studio on the bottom right. See attached photo below.
In some formatting I had mistakingly changed the line separator to CR and committed. Then the ˆM problem appeared in every file I committed.
I changed the option to LF and committed every file again and now it is resolved.
edited Jan 23 at 10:11
tripleee
93.1k13130184
answered Dec 20 '18 at 11:15
JSONParserJSONParser
6241923
add a comment |
0
0
0
There was an option to change the Line separator in Android Studio on the bottom right. See attached photo below.
In some formatting I had mistakingly changed the line separator to CR and committed. Then the ˆM problem appeared in every file I committed.
I changed the option to LF and committed every file again and now it is resolved.
edited Jan 23 at 10:11
tripleee
93.1k13130184
answered Dec 20 '18 at 11:15
JSONParserJSONParser
6241923
There was an option to change the Line separator in Android Studio on the bottom right. See attached photo below.
In some formatting I had mistakingly changed the line separator to CR and committed. Then the ˆM problem appeared in every file I committed.
I changed the option to LF and committed every file again and now it is resolved.
edited Jan 23 at 10:11
tripleee
93.1k13130184
answered Dec 20 '18 at 11:15
JSONParserJSONParser
6241923
edited Jan 23 at 10:11
tripleee
93.1k13130184
edited Jan 23 at 10:11
tripleee
93.1k13130184
edited Jan 23 at 10:11
tripleee
93.1k13130184
93.1k13130184
answered Dec 20 '18 at 11:15
JSONParserJSONParser
6241923
answered Dec 20 '18 at 11:15
JSONParserJSONParser
6241923
answered Dec 20 '18 at 11:15
JSONParserJSONParser
6241923
6241923
add a comment |
add a comment |
draft saved
draft discarded
Thanks for contributing an answer to Stack Overflow!
- Please be sure to answer the question. Provide details and share your research!
But avoid …
- Asking for help, clarification, or responding to other answers.
- Making statements based on opinion; back them up with references or personal experience.
To learn more, see our tips on writing great answers.
draft saved
draft discarded
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
StackExchange.ready(
function () {
StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f53425617%2fgit-diff-is-not-working-as-expected-in-android-studio%23new-answer', 'question_page');
}
);
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Without better formatting your diff snippet is hard to read.
– Werner Henze
Nov 22 '18 at 7:38
@WernerHenze having the same issue
– JSONParser
Nov 22 '18 at 7:39