Warning: Can't synchronize with repository "(default)" (/home/git/ome.git does not appear to be a Git repository.). Look in the Trac log for more information.
Notice: In order to edit this ticket you need to be either: a Product Owner, The owner or the reporter of the ticket, or, in case of a Task not yet assigned, a team_member"

Task #8081 (closed)

Opened 12 years ago

Closed 12 years ago

Rebase hell

Reported by: cxallan Owned by: cxallan
Priority: minor Milestone: OMERO-4.4
Component: General Version: n.a.
Keywords: n.a. Cc: web-team@…
Resources: n.a. Referenced By: n.a.
References: n.a. Remaining Time: 0.0d
Sprint: 2012-02-28 (9)

Description

All of the decorator branches and ports need to be rebased now that 6190_iframe has been merged.

Change History (4)

comment:1 Changed 12 years ago by cxallan

  • Status changed from new to accepted

comment:2 Changed 12 years ago by cxallan

  • Cc web-team@… added

6343_conn_decorator has been successfully rebased atop of develop:

comment:3 Changed 12 years ago by cxallan

6342_integration has been successfully rebased atop of develop and rm_dbg_for_carlos (#8083):

comment:4 Changed 12 years ago by cxallan

  • Remaining Time changed from 0.5 to 0
  • Status changed from accepted to closed
Note: See TracTickets for help on using tickets. You may also have a look at Agilo extensions to the ticket.

1.3.13-PRO © 2008-2011 Agilo Software all rights reserved (this page was served in: 0.72503 sec.)

© 2000-2014 University of Dundee & Open Microscopy Environment. Creative Commons Attribution 3.0 Unported License
OME source code is available under the GNU General public license or through commercial license from Glencoe Software

We're Hiring!