@beelee The error you're seeing is due to there being changes on the
test branch on the remote repo (
origin) that are not in your local repo. One way this can happen is if you have two local copies of the repo connected to the same
origin, and you made different changes in each local repo.
The most straightforward solution to the problem is exactly what the error message tells you to do: run the
git pull command. However, this can fail if there are changes made to the same line(s). This results in a conflict and Git will tell you if this is the case after running
git pull. If you run into this issue, I'll have to give you a primer on how you go about resolving conflicts.
It would be interesting to see how your local
test branch is out of sync with the same branch on
origin (https://github.com/triplea-maps/global_40_house_rules/commits/test). You can do that by running
git log --stat and posting the output here.
Just looking at the
test branch on
origin, it appears it is waaaay behind the
master branch. In fact, I'm not sure it even has a common parent. I'm guessing when you started on your latest changes, you simply used the existing
test branch from January 2018, and that you didn't start a new branch from the current
One typically begins each new unit of work (a pull request in GitHub parlance) with something like
git checkout -b my-new-branch master. That creates a new branch named
my-new-branch so that it is basically a copy of
master. Then you commit changes to that new branch and push them to
origin. Once your pull request is complete, you would delete
my-new-branch. When you're ready to start your second unit of work, you would repeat that process with a different branch (e.g.