Menu

Git diff is showing complete file content as changed but there is only few line of changes in file.

This is expected behavior of Git diff and there is nothing wrong in this case. See the issue 52036
When we look the plain diff, we can see that, the old content used Windows style line endings (CR LF), whereas the new content is stored with Unix style line endings (LF).
>> old style.scss file content
Line 1 CR LF
Line 2 CR LF 
>> new style.scss file content
Line 1 LF
Line 2 LF 
We may skip those white space changes from compression using GitLab or Git via UI or command line. 
Steps to hide/ignore white space changes from git diff.
  1. Go to your merge request.
  2. Navigate to change between section.
  3. Click on the setting button, from right side of "change between section"
  4. Unchecked the option "Show whitespace changes"
After doing this you the compare section will show only real changes. Below is the screenshot which you refer.
Show-whitespace-changes-git-diff


We can also see the exact diff using ignore space command
git diff --ignore-space-at-eol

References

AEM Cloud Service deployment issue | Packages shouldn't mix mutable and immutable content

While deploying our old Adobe Experience Manager(AEM) code to AEM cloud service, we find some code smell issues,
ImmutableMutableMixedPackage in project build issue report. We will understand this issue here and also look how to fix this code issue from project.

Lets first understand what part of our AEM project is mutable and immutable.

Mutable

/content , /conf , /var , /etc , /oak:index , /system , /tmp , etc. are all mutable areas of AEM project, it means they can be changed at runtime.

Immutable

/apps and /libs are considered immutable areas of AEM as they cannot be changed and we are not allowed to perform CUD(create, update, delete) operation at runtime. Any attempt to change an immutable area at runtime will fail. On immutable areas we can only perform the read operation.

Issue Description


In order to make our project compatible with Cloud Service deployment model, individual content packages must contain either content for the immutable areas of the repository (that is, /apps and /libs, although /libs should not and never be modified by custom code and will cause a separate violation) or the mutable area (that is, everything else), but not both. For example, a package which includes both /apps/myproject/components/text and /etc/clientlibs/myproject is not compatible with Cloud Service and will cause an issue to be reported.
When we try to edit file under /apps directory and save, aem will not allow and show error message "Could not save changes. Received 409 () for saving changes in workspace crx.default. org.apache.jackrabbit.oak.spi.state.ReadyOnlyBuilderException: This builder is read-only."

Who bring the Coffee to India?

Coffee is a middle eastern drink prepare from Coffee beans. Coffee came in India in 16th century, when a Sufi saint Baba Budan. When he was returning from Hajj, he brings seven raw seeds of Coffee from a port of Yemen, so he can plant in India. Later he planted those beans near to his khanqah in Chandragiri Hills. 
Baba Budan shrine[Bababudangiri shrine] is located in southern part of India in Chikmagaluru District of state of Karnataka.

References:

  1. History of Coffee in India
  2. How coffee came to India?
  3. Coffee origin in India
  4. Coffee production in India | Wikipedia
  5. Sufi Saint Baba Budan

Roasted Coffee beans
Roasted coffee beans