caseyjhol
commented
4 years ago When I merged previously, I squashed all of your commits into 1, which is why the commit history is different (your branch actually does have more commits than mine). To completely reset your branch to match mine, see https://stackoverflow.com/questions/1628088/reset-local-repository-branch-to-be-just-like-remote-repository-head. If you've made changes and want to apply them on top of my branch, see https://nathanleclaire.com/blog/2014/09/14/dont-be-scared-of-git-rebase/.
So, after I merge this and before you do any more work, I'd follow the steps in the StackOverflow link to reset your branch to match mine. Another option is to just make a new branch based off of mine.
Added simple check if in debug mode. Otherwise, it is not really necessary to output a connection error, as it will probably connect once discovered.
Side note @caseyjhol : The only diff is in the last commit. Is this normal for it to show all these previous commits, even though the only thing I changed, as compared to your branch, is the one file? I don't understand how to keep my fork up-to-date with your fork without it showing all these commits. Only other solution I can think of is to delete my repo and fork it again from the current place. But I'm not 100% familiar with all the git actions.