+[10 years ago]cholcombei wonder if i should just manually set it +[10 years ago]VxJasonxVin which case, you just send them to gluster/index.html +[10 years ago]cholcombeso i should axe that? +[10 years ago]VxJasonxVas far as I can tell, yeah +[10 years ago]cholcombealright i'll nuke it and see what happens :)
+[10 years ago]t4nk913Question +[10 years ago]VxJasonxVAnswer +[10 years ago]t4nk913if you reverse a bad merge commit (on remote), what happens when you merge the remote back into a branch that contains the files that were deleted remotely due to the reverse? +[10 years ago]VxJasonxVit should re-perform the merge +[10 years ago]t4nk913It wouldn't delete the files because they were deleted in the reverse commit?