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.
Last active
January 11, 2018 02:01
-
-
Save mattstauffer/4203242322e4e494e189 to your computer and use it in GitHub Desktop.
Comments for my Upgrading Laravel 4 to Laravel 5 post
@mattstauffer, I run the command git merge laravel/master --squash but it errors
fatal: refusing to merge unrelated histories
How to solve this please?
^solved via --allow-unrelated-histories option
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
@mattstauffer Incredibly late to the party, but I've got a couple of comments to make.
First, thanks for the article, it's been a huge help in upgrading my sites and the accompanying package that I use.
Having worked through it all, I'd possibly clarify the git squash comments. Having never used it before, it took me a little while to realize that I didn't need to squash the first of the 3 commits (based on the example of 3 commits that you mentioned). I was trying to squash all 3 rather than just the latter ones. Incredibly useful feature though :)
Also the comment from @jtgrimes could definitely do with being added to the instructions.