Hi,
how can i resolve the conflict. i can't see any conflict in my git account ? On Sat, Jun 4, 2016 at 5:25 PM, Thilina Manamgoda <[email protected]> wrote: > Hi, > > No those are cwl files are not mine. but i can write few of them for > testing. The "Testing" class is used for just play around with the > functions .it is not linked to any other class . > > > > On Sat, Jun 4, 2016 at 4:33 PM, Stian Soiland-Reyes <[email protected]> > wrote: > >> Thanks! >> >> I get: >> >> > This branch has conflicts that must be resolved >> >> Could you try to merge with apache:cwl-browse branch and resolve the >> conflict in git? Probably we stepped on each-other's toes in the >> pom.xml because of the 2.1.0 release candidate.. >> >> >> Also I see you put in ASF license headers (yay!), but not in all the >> files. Could you add to the remaining files, e.g. in >> taverna-cwl-activity/src/main/java/org/apache/taverna/cwl/Type.java >> >> >> The test cwl files you commit, did you write them yourself? In which >> case you can also add ASF headers to those (using "# " comments). If >> they come from elsewhere we have to be more careful - so it's better >> if they are your own. :) >> >> On 4 June 2016 at 11:54, Thilina Manamgoda <[email protected]> wrote: >> > Hi, >> > >> > >> > I have made the pull request on github .please tell me am i doing it >> > correct or not. >> > >> > regards, >> > thilina >> >> >> >> -- >> Stian Soiland-Reyes >> Apache Taverna (incubating), Apache Commons >> http://orcid.org/0000-0001-9842-9718 >> > >
