Closed ebeshero closed 7 years ago
How would I resolve these conflicts?
@ajnewton1 I think I've just resolved the conflict. It was over the changes you'd made to the menu.html. I've just resolved it so YOUR version replaces what's on the master branch!
I'm going to just merge this pull request in...everyone okay with that?
@ajnewton1 At some point when we can meet and look at two computers, I'll show you how to resolve a conflict like this. It's not hard, but it involves carefully comparing files and making sure which is the version that you want to keep.
Pull request to merge Aaron's updates to the website into the master branch.