Merging changes from master into staging branch

imasaru / sabbath-school-lessons

MIT License

3 stars 1 forks source link

Merging changes from master into staging branch #1

Closed imasaru closed 7 years ago

imasaru commented 7 years ago

This is a bit weird. I made all of my changes without thinking to the master branch of my fork instead of the staging branch, so I'm going to pull changes from the master branch into the staging branch and reset my master branch to be even with the Adventech master.

imasaru commented 7 years ago

Problem solved. I reset my local branch to a previous commit, and pushed its changes to stage. I will now close this pull request and reset my master branch.