I want to merge this branch into the master, but it won’t let me. When I compare the two files one way (master --> Nic-Branch), it says there is no difference, but the other way (Nic-Branch --> Master), bare differences.
https://gyazo.com/38e4c3c0b6266f0e74870beee042c774
https://gyazo.com/ebf8891db7519705128b438b7687de49
Any help would be great!
This is just how Git works; it’s entirely diff based (to put it extremely simply). The Nic-branch has diffs that master doesn’t, and it knows that. Doesn’t work the other way around, though. master has no knowledge of what’s going on inside Nic-branch.
Oh maybe I’ve got myself confused lol. How do I merge my changes from Nic into master? If I create a PR, it still says no difference.
If you have a git terminal, it should be as easy as
git checkout master # switch branch to master
git merge Nic-branch # Merge Nic-branch’s diffs
git push origin master # Push to GitHub