+ [2015-09-27T23:24:42Z] Goldberg that scared the shit out of me...
+ [2015-09-27T23:25:17Z] milki yay
+ [2015-09-27T23:25:35Z] milki Goldberg: as long git knows about your files (via git add), anything can be recoverable
+ [2015-09-27T23:26:12Z] Goldberg that's good to know. I am still new to it. so working on it. thanks a bunch. I should sleep now before I screw up anything else....
+ [2015-09-27T23:26:12Z] milki Goldberg: and in most cases, git wont delete things it doesnt know about

message no. 114057

Posted by dman777_alter in #github at 2015-09-27T01:47:34Z

I have a repo named "fixer-upper" I want to merge into master. I want to it overwrite anything in master without haveing to manually resolve any conflicts. Any idea how I can do that?
+ [2015-09-28T03:29:56Z] milki whoa, theres a github channel on youtube
+ [2015-09-28T09:55:36Z] alcohol is this still valid?
+ [2015-09-28T09:55:37Z] alcohol https://github.com/blog/1270-easier-builds-and-deployments-using-git-over-https-and-oauth
+ [2015-09-28T09:57:41Z] Seveas alcohol: yes.