git merge upstream/master
mergecommand, there are three possible outcomes:
Already up-to-date.response. That means your fork is up to date with consul 😊👌
Merge remote-tracking branch 'upstream/master' into upstream. That means git was able to grab latest changes from CONSUL's master branch, and it can merge them without code change conflicts. Finish the commit.
Automatic merge failed; fix conflicts and then commit the result.message. That means there are conflicts between the code changes you did and the ones done on CONSUL repository since the last time you update it. That's the main reason we strongly recommend often updates of your fork (think at least monthly). Resolve merge conflicts carefully and commit them.