Skip to content

Instantly share code, notes, and snippets.

@mattstauffer

mattstauffer/request-for-comments.md

Last active January 11, 2018 02:01
Show Gist options
  • Star 1 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save mattstauffer/4203242322e4e494e189 to your computer and use it in GitHub Desktop.
Save mattstauffer/4203242322e4e494e189 to your computer and use it in GitHub Desktop.
Download ZIP
Comments for my Upgrading Laravel 4 to Laravel 5 post
Raw
request-for-comments.md

Please note any missing pieces, wrong directions, or anything else in the comments. Thanks!

This is trying to catch all framework-related changes that are missing from my post RE upgrading Laravel 4 to 5.

@ajcastro
Copy link

ajcastro commented Jan 11, 2018 •
edited

@mattstauffer, I run the command git merge laravel/master --squash but it errors

fatal: refusing to merge unrelated histories

How to solve this please?

@ajcastro
Copy link

^solved via --allow-unrelated-histories option

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment