Red Hat Bugzilla – Bug 34885
Conflicting code on webqa
Last modified: 2015-01-07 18:44:58 EST
Go to http://www.webqa.redhat.com/training/rhce/courses/, then click on the
RH300 link. Will get really interesting page where it appears that another
page is absorbed into a frame on the current page and you end up with 2
Now, the interesting thing is that in the middle of the page is a CVS
conflict indicator, so someone committed code and pushed it to webqa with a
conflict in it.
I fixed the conflict issue - but I didn't think that CVS was supposed to accept
a commit of a file with a conflict in the first place. (?)
OK, fixed on webqa. I don't think that CVS accepted a commit with a conflict, I
think that someone 'cvs up'd and did not resolve the resulting conflict, thus
leaving hte conflict indicators in the code on webqa.
I wondered if that were the case or not, so before I set about "fixing" it, I
deleted the file completely from my sandbox, then I did a cvs update to get the
current version... the conflict was there.