I see. This may be caused by the incident we had a while ago, someone forcely pushed his local repo into the origin GIT repo that carried over these unmerged changes.
I suggest you to rebase your changes on top of a good state commit to continue. Kelven > -----Original Message----- > From: Fred Wittekind [mailto:r...@twister.dyndns.org] > Sent: Thursday, May 17, 2012 11:13 AM > To: cloudstack-dev@incubator.apache.org > Subject: Re: Conflict Markers in Git Commits: > > No, I'm not using a local GIT repo. > > The conflicts are present in the patch file downloaded from git.cloud.com > http://git.cloud.com/cgit/cloudstack- > oss/patch/?id=cd13762e44e36775f8cf29318cce82c3bb4c89b0 > > And visible viewing one of the files via: > http://git.cloud.com/cgit/cloudstack-oss/tree/console- > proxy/src/com/cloud/consoleproxy/vnc/BufferedImageCanvas.java?h=3.0.x&id= > cd13762e44e36775f8cf29318cce82c3bb4c89b0 > > I'm building CS via using a stock 3.0.2 tarball, and patch files using > rpmbuild -ba cloud.spec > > On 5/17/2012 1:50 PM, Kelven Yang wrote: > > These are conflicts when you pull things into your local GIT repo. You > will have to solve these conflicts locally. Following article may help > > > > http://genomewiki.ucsc.edu/index.php/Resolving_merge_conflicts_in_Git > > > > Kelven > > > >> -----Original Message----- > >> From: Fred Wittekind [mailto:r...@twister.dyndns.org] > >> Sent: Thursday, May 17, 2012 10:42 AM > >> To: cloudstack-dev@incubator.apache.org > >> Subject: Re: Conflict Markers in Git Commits: > >> > >> 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 > >
