+[8 years ago]gitnoobI basically want to rollback master to the point before I merged my changes from branch x +[8 years ago]gitnooband then apply branch x from its current HEAD ontop of master +[8 years ago]gitnoobis this a good way to resolve the conflicts, and can someone give me some help? +[8 years ago]tojokohi +[8 years ago]tojokosomeone runnin' desktop bsd!? 1.7?
thanks for resolving "I am not human" issue in minutes
+[8 years ago]Komanda523243 https://github.com/tpyo/amazon-s3-php-class/issues/84#issuecomment-52602674 +[8 years ago]Komanda523243how do i checkout this repository & apply this patch +[8 years ago]Komanda523243can't get it to work :[ +[8 years ago]Komanda523243https://github.com/tpyo/amazon-s3-php-class/issues/84#issuecomment-52602674 +[8 years ago]Komanda523243git am lastTry.patch