Complete overwrite of files

Question

Complete overwrite of files

Closed this issue 6 years ago · 3 comments

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 85d4b96 and 3461263. Why overwrite?

Answer 1 · 2019-07-23T15:31:59.000Z

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.

Answer 2 · 2019-07-23T15:58:33.000Z

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

…

On Tue, Jul 23, 2019, 17:32 Ross Wang ***@***.***> 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 <#21?email_source=notifications&email_token=ABPAHOTDVN4IZ5XPNKH6M6DQA4QBDA5CNFSM4IGBRVV2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD2TQL3Y#issuecomment-514262511>, or mute the thread <https://github.com/notifications/unsubscribe-auth/ABPAHOT253QYYEPUQIUFCCLQA4QBDANCNFSM4IGBRVVQ> .

Answer 3 · 2019-07-23T16:07:01.000Z

Good. Glad I didn't break anything :)