search

MITLibraries / MITLibraries-child

A Wordpress child theme that descends from MITLibraries-parent
GNU General Public License v3.0
1 stars 1 forks source link

Attempted rebuild of Hattie's "post feed and category updates" #130

Closed matt-bernhardt closed 7 years ago

matt-bernhardt commented 7 years ago

This is my attempt to use git cherry-pick to reconstruct a branch of just two commits that somehow was based off of an unmerged branch. This is based off an analysis of MITLibraries/MITLibraries-child#129

Hattie, can you please look over the Files Changed section of this PR to see whether this look like what you were trying to achieve in the earlier branch? When I look at the five commits on that other branch, these two that I've cherry-picked seem like where you're actually making changes. The rest seem to be merge commits from master back to the branch, or from using an unmerged branch as the base of your work. I'm not sure how this is happening - we might need to sit down and look at the structure of your local repo.

matt-bernhardt commented 7 years ago

Closing without merging - it looks like this was the correct scope, but I agree with you that it would be better to fix whatever was causing the original branch to go sideways.