search

ranqiangjun / drupal

Drupal project template built on top of https://github.com/drupal/recommended-project
1 stars 0 forks source link

Do not attempt to merge composer.lock when rebasing or merging #3

Open ranqiangjun opened 4 years ago

ranqiangjun commented 4 years ago

According to https://blog.martinhujer.cz/17-tips-for-using-composer-efficiently/#tip-%239%3A-do-not-attempt-to-merge-%60composer.lock%60-when-rebasing-or-merging

ranqiangjun commented 4 years ago

gitattributes-append.txt

ranqiangjun commented 4 years ago

Todo: Create an issue on d.o. : Allow drupal-scaffold appending content from an URL 

   "file-mapping": {
                "[project-root]/.gitattributes": {
                    "mode": "append",
                    "append": "assets/gitattributes-append.txt"
                }
            }
   "file-mapping": {
                "[project-root]/.gitattributes": {
                    "mode": "append",
                    "append": "https://github.com/jungleran/drupal-composer-project-template/files/4118824/gitattributes-append.txt"
                }
            }