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
