+ [2016-11-20T22:11:45Z] gitnoob I basically want to rollback master to the point before I merged my changes from branch x

+ [2016-11-20T22:12:17Z] gitnoob and then apply branch x from its current HEAD ontop of master

+ [2016-11-20T22:12:33Z] gitnoob is this a good way to resolve the conflicts, and can someone give me some help?

+ [2016-11-20T22:26:29Z] tojoko hi

+ [2016-11-20T22:26:42Z] tojoko someone runnin' desktop bsd!? 1.7?

message no. 157097

Posted by tx in #github at 2016-11-20T15:06:15Z

hmm

+ [2016-11-21T03:56:51Z] Komanda523243 https://github.com/tpyo/amazon-s3-php-class/issues/84#issuecomment-52602674

+ [2016-11-21T03:57:02Z] Komanda523243 how do i checkout this repository & apply this patch

+ [2016-11-21T03:57:07Z] Komanda523243 can't get it to work :[

+ [2016-11-21T04:38:15Z] Komanda523243 https://github.com/tpyo/amazon-s3-php-class/issues/84#issuecomment-52602674

+ [2016-11-21T04:38:19Z] Komanda523243 git am lastTry.patch

irc logs