Request to fork back to THB

TarHeelBiostatistics / DoctoralThesisTexTemplate

LaTeX Template for Doctoral Theses. NO guarantee that this is up to date with current UNC-CH Graduate School's formatting guidelines.

GNU General Public License v3.0

3 stars 4 forks source link

Request to fork back to THB #13

Closed phoebejiang closed 7 years ago

phoebejiang commented 7 years ago

I fetched THB changes, merged to my local, and pushed my changes (adding *.DS_Store and deleting .DS_Store files). At least I think I did it..

I would like to request merge my fork back to the original THB. Thanks!

BarkleyBG commented 7 years ago

Nice job! Those DS_Store files are pesky for Mac users.

I had already fixed this in #12 , so I'm closing this without merging.

I think now you'll see the value of using "topic" branches, because your master branch has different history that THB's master branch, and so you'll need to force overwrite your history in order to keep up. Sorry! We can take care of this in a day or two - just file an issue on your repo ("overwrite history to match THB") and tag me and we'll get to it.