Rename app/views/layout.blade.php` as `app/views/template.blade.php`
Add content to the .gitignore file in the master branch
Change the .gitignore gile in the hotfix-gitignore branch
Delete app/views/layout.blade.php into the rebase phase