taverna-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Denis Karyakin <samhane...@gmail.com>
Subject Re: Taverna Databundle Viewer - progress
Date Thu, 06 Aug 2015 23:55:18 GMT
2015-08-05 17:59 GMT+03:00 alaninmcr <alaninmcr@googlemail.com>:

> On 04/08/2015 23:31, Denis Karyakin wrote:
>> Hello,
>> What I need to do with different commits?
> I am uncertain what you are asking. Were the merge conflicts sorted out?
Maybe I misunderstood work with pull requests to the apache repository.

Repository https://github.com/apache/incubator-taverna-databundle-viewer
have commits:
"Pull from github" ae912ef29fe42b808840c9b4833a21d0e6cae3a9
"Pull from github" 17edf13a7d3149904467ecd3a5cd3e256d447ec4

This two commits contain all changes (all files and content in this files)
from  commit
"Create Rails application" 042ef369762de3019d539a4d8a605e68d5087391
to commit
"Removed trailing whitespaces" cac0c307a8a31ac9285f8bf0afb1c1ba4bd6c697
in my fork https://github.com/Samhane/incubator-taverna-databundle-viewer

So, in repositories are different history and therefore I get many merge
conflicts when pull from
Should I merge with
https://github.com/apache/incubator-taverna-databundle-viewer (as upstream
repository) and fix all conflicts? Or I should only create pull request?

> Currently I work with new features in separate git branch. I processed all
>> workflow files from the Starter Pack and now work by show workflow run
>> from
>> input to output step by step
> Hello. I think we need to get user feedback. Do you have a server stood up
> or should I do it?

I have a deployed application on heroku. But before presentation to get
user feedback I want to finish with draft showing full workflow run

> Alan

  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message