search

chiehrosswang / TRB_LaTeX_tex

A LaTeX template for Transportation Research Board Annual Meeting papers
MIT License
45 stars 22 forks source link

Complete overwrite of files #21

Closed akstrfn closed 5 years ago

akstrfn commented 5 years ago

Wanted to update my template to follow this repo and some conflicts emerged. I proceeded with git blame to see when and why some of the changes occured and saw the commits 85d4b9657f11ce3e9b7a731d4f122da84b2029c1 and 34612638be74ed919067c3dae61df57fab3ba690. Why overwrite?

chiehrosswang commented 5 years ago

Some dumb issue when I tried to sync the master on my local drive. The files should be the same as before the overwrite though.

akstrfn commented 5 years ago

They were the same. I see the problem, git can be confusing sometimes 🙂

On Tue, Jul 23, 2019, 17:32 Ross Wang notifications@github.com wrote:

Some dumb issue when I tried to sync the master on my local drive. The files should be the same as before the overwrite though.

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/chiehrosswang/TRB_LaTeX_tex/issues/21?email_source=notifications&email_token=ABPAHOTDVN4IZ5XPNKH6M6DQA4QBDA5CNFSM4IGBRVV2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD2TQL3Y#issuecomment-514262511, or mute the thread https://github.com/notifications/unsubscribe-auth/ABPAHOT253QYYEPUQIUFCCLQA4QBDANCNFSM4IGBRVVQ .

chiehrosswang commented 5 years ago

Good. Glad I didn't break anything :)