We do have some changes to the code (patches attached to open bug reports). We're also trying to be picky about changes we introduce that are not yet part of a release.
I notice if I browse to the file in git, I don't see the conflict markers: http://git.cloud.com/cgit/cloudstack-oss/tree/console-proxy/src/com/cloud/consoleproxy/vnc/BufferedImageCanvas.java?h=3.0.x But I do see them in the patch attached to the commit, but, I don't see a commit removing them. Fred Wittekind On 5/17/2012 12:19 PM, Kelven Yang wrote: > Fred, > > Unless you have made changes and want to merge your changes, you may just > want to reset to the branch in order to get a build out of it. > > Kelven > >> -----Original Message----- >> From: Fred Wittekind [mailto:r...@twister.dyndns.org] >> Sent: Thursday, May 17, 2012 7:35 AM >> To: cloudstack-dev@incubator.apache.org >> Subject: Conflict Markers in Git Commits: >> >> I was trying to build a release that included some of the console >> patches, but, ran into some compile errors as result of conflict markers >> being part of a git commit. >> >> Example: >> http://git.cloud.com/cgit/cloudstack- >> oss/commit/?h=3.0.x&id=cd13762e44e36775f8cf29318cce82c3bb4c89b0 >> >> Fred Wittekind >
