Merging OSB changes from two projects

Good day,
We have two (or possibly more) projects working on OSB. There are some assets that will be modified by more than one project but due to scope and timelines, this work cannot happen on one version.
Is there a recommended way to merge changes from one branch of OSB assets to another branch of OSB assets? I know that under the hood it is just XML but treating the XML files as mergable assets without a tool like the Eclipse VCS support to help guide it seems like a recipe for problems.
How do others handle this issue?
Thanks,
Sean

Hi Sean,
There is really no tool to guide us to merge two versions of the osb code. As you mentioned, given that osb code is represented as an xml file, you can try to do a comparison between them and merge them manually, but if the changes done in the different branches are significantly different I would refrain from doing so.
#1 The best way is to let one team take the pain of redoing their changes on top of the other team's version.
#2 One stop-gap solution is to build the logic in two different local proxies (by each team) and then have a wrapper proxy that can invoke appropriate proxy based on some logic. But if the functionality built by both the teams is similar, then the above option #1 will be the best way to maintain the code.
Let us know in case of further issues/clarifications.
Thanks,
Patrick

Similar Messages

  • Merging iPhoto Libraries from two Macs

    Does anyone have a way of physically combining (not just sharing) iPhoto libraries from two macs? I'm hoping there's an easier, smarter way of doing it than just exporting all of the photos from one and importing them into the other and then just doing the reverse. Is there software that does this smarter? Can get rid of duplicates, etc.?

    Merge?
    Do you mean 'sync' libraries
    The general term means when two Libraries (A and B) are compared and files in Library A are copied to Library B, while files in Library B are also copied to Library A so that both Libraries are identical.
    This is bi-directional copying and you cannot do this with automatically with iPhoto. No Syncing software is capable of parsing the iPhoto Library in this manner. One or both of your Libraries will be damaged if you try this.
    The nearest you can get to syncing is to use iPhoto Library Manager to move files/Albums/Events plus assoicated metadata between Libraries. This process cannot be automated.
    The Export/Import route will not get your versions.
    Regards
    TD

  • Merging MacMail Emails From Two Mail Folders

    Because I had to use a different system hard drive for a few months I have email messages in two Mail Library folders.  I need to merge these new emails from the temporary hard drive into the original folder.  What would be the best way of doing this without having a huge amount of duplicate emails from both folders if I did a simple import?  I have over a hundred mail folders so I don't want to do this manually.
    Thanks!

    if both computers are running leopard you can export messages as follows. put the messages you want to export into a separate mailbox and choose mailbox menu->archive mailbox. move the archive to the other computer and in Mail go to File menu->import mailboxes.

  • Cannot get the copy setting to change from two-sided to one-sided on my officejet pro 8615

    My copy setting on my printer (HP Officejet Pro 8615) all-in-one shows
    Two Sided               1:1
    When I tab over to where the 1-sided original and 1-sided original copy & 1-sided original and 2-sided copy can be selected, the blue light is on 1-sided original and 1-sided copy.  It will not change to the One sided    1:1.  The printer will print one side and asks you to flip over to side 2.  As a result, I cannot print anything.  Please help

    Hi @Granniej60 
    It sounds like we may need to select the option you want in the copy menu then select it as a default. To make sure I understand though, you are unable to select the 1 sided original : 2 sided copy, or you have selected it and it is not working?
    Please click the Thumbs up icon below to thank me for responding.
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    Please click “Accept as Solution” if you feel my post solved your issue, it will help others find the solution.
    Sunshyn2005 - I work on behalf of HP

  • How to merge the data from two cubes into ODS?

    Hi,
    I wan to analyze the data of both the cubes by means of merging into an ODS.
    And i want to have one of the characteristic is used as a key for the purpose which is existing in both the cubes
    Cany nay one detail me of how this can be done?
    Thanks,
    Ravi

    Hi,
    If it is very needful.
    you can create the ODS object for each infocubes and map these ODS objects to target ODS object.
    or, you can create the Export datasources from each infocube and map these to new target ODS object which is having all the char and KF of both the infocubes.
    reg.
    Vis

  • How to change from two sided printing to one page printing on a macbook air

    How do you change the printer setting on a macbook air? I go to print something and it prints double sided, is there a way to change that setting?I have an Epson printer that does air printing. Please help!

    That would be a function of the printer settings. So once you call up the printer to print something go into the settings and change it from Duplex to single sided printing.

  • How do you move changes from your project developments into the maintenance development system?

    Good day colleagues.
    We are in the process of introducing retrofit, and the picture is clear for us, generally speaking, to retrofit the project landscape with the changes done in the maintenance landscape.
    What about the other way around? We mean, when the project is set to Go Live, we understand the transports will be all added, e.g. to the Production System buffer to be moved there via Maintenance Cycle, based on the way we defined the project and the logical component being used.
    However, how do you feed those project transports to your Maintenance Development System using ChaRM?  or do you do that Manually?  We doubt. Copying Production back into Development?  no way !!!
    How do you establish that?  We have a sort of idea but the documents about retrofit only seem to talk about moving transports one way, as far as we have found.
    Many thanks for any feedback.
    Juan Carlos

    Hi Piyush.
    I apologize for a late close on this questioning about moving projects back into the maintenance stream.
    Basically there are 2 solutions as far as we know:
    1. What Vivek mentions, which is performing a cutover and repacking the project transports into 2 transports in the maintenance stream:  A workbench and a customizing.   In that sense, at the end of the day you end up moving just 2 transports to the maintenance stream up to Production.   They contain all your project objects.  Thanks to Vivek, again.
    This is a very practical and interesting approach.  The only reason we did not adopt it, is based on the fact that if by any chance we encounter an issue with a project transport object in the maintenance stream (Dev or QA), now that all is bundled together, we may be stuck right at the time weare getting ready to GoLive.  How tough is going to be that issue? how easy and quick to fix?how much would that affect the whole project time frame?   Those questions made us decide to option 2.
    2.  What we are doing is that at cutover we move at the same time all project transports to the transport buffer of each of the maintenance stream systems (Dev, QA, and Prod).   We first open the gate to move the transports to Dev and we test, then to QA and we test, as well.  If there may be an issue, and the issue can not be quickly resolved by the project team, we can go up to the extreme of using a new feature introduced in ChaRM in SP10, if we are not wrong, but definitely available in SP12.  That feature provides a way to selectively decide which transports of the release are to Go Live and which ones do not, although we have no had to use that feature, yet, but it is there.
    We do not see any risk on adding the transports to the maintenance buffers at the same time.  There are ways to control the systems that are open for receiving transports, and the project phases, which guarantees no room for error.  There have to be deliberate actions taken (more than one in our case), to wrongly move a project to GoLive before its time comes.
    That is more or less the scenario Piyush.    
    Hope that explains the scenario.  So far no decision on really publishing as a blog.  It seems not to be written on stone, as consulting with different companies, each adds its own flavor to the recipe and shuffle ideas to get to what they are looking for and makes them happy.
    Juan

  • Merge 2 iPhones from two iTunes accounts to 1.

    My wife and I have iPhone 4s on separate iTunes accounts. We want to merge then phones onto one account but do not want to loose any apps. How do we do this?

    from this support article:
    I have multiple Apple IDs. Is there a way for me to consolidate them into a single Apple ID? 
    At this time, Apple IDs cannot be consolidated.

  • Blank page showing when changing from two column to one column pages

    This is the scenario:
    Document with two master pages - Page1 has two content areas - left column and right column, Page 2 has one content area the full page width named 'FullPage'
    One page set named PageSetOne - with multiple subforms, each with Pagination setting of Following Previous and Continue filling parent.
    Second page set named PageSetTwo - this has a single subform with Pagination setting of place on Page2. The child subform has itself a subform with Pagination setting of Place in Content Area 'FullPage'.
         This page set is initially set to be Hidden.
    Third page set named PageSetThree - this has a single subform with Pagination setting of place in Page 1 and a child subform with Pagination setting of Following Previous.
    [Obviously I am simplifying names and content here].
    The problem is this: when in design mode, there is a blank page showing at the end of the document whenever there are sufficient subforms in PageSetOne such that subforms are displayed in the right hand column.
    When subforms are removed so that nothing is showing in the right hand column then the blank page goes away.
    I have put a marker subform immediately after the last subform in PageSetThree and can see that the blank page is showing after this.
    Also, the following problem:
         When in preview mode, the extra blank page at the end does not display (which is good)
         BUT if the hidden PageSetTwo is made to be visible AND there is content showing in the right hand column prior to it,
         THEN a blank page is displayed just before the newly displayed PageSetTwo page (a single column page on Master page Page2).
    I have tried every combination of Pagination Place before and after settings and can find no way to avoid the blank pages.
    Does anyone have a clue as to what is going on and how I can avoid these blanks showing up?

    I have finally managed to solve this problem.
    The issue was not a subform extending too far out, it was a pagination setting, as Niall suggested.
    I created a blank document to analyse the issue closely, and lo, my new blank doc with all default settings, worked perfectly.
    So I revisited my forms and compared the pagination settings subform by subform.
    This is what I had to change to ensure that all pages flowed with no extras:
    PageSetOne (which is supposed to show using the two column master)
    set the top page Place = ‘In Content Area Leftcolumn’ and After=Continue filling parent
    All child subforms each with Pagination setting of Following Previous and Continue filling parent.
    PageSetTwo (to show in the full page column Master)
    set the top page Place = ‘In Content Area FullPage’ and After=Continue filling parent
    All child subforms each with Pagination setting of Following Previous and Continue filling parent.
    PageSetThree ( back to two column master)
    set the top page Place = ‘On Page1’ and After=Continue filling parent
    All child subforms each with Pagination setting of Following Previous and Continue filling parent.
    I discovered that the critical setting was for PageSetOne. The After setting needed to be Continue filling Parent
    Once I had those settings in order then the form performed as required.
    This has been a frustrating learning experience but at least ultimately successful.
    AJ

  • Is there a way to merge my purchases from two apple accounts

    I made several song purchases with an apple ID that I had set up when I purchased an Ipod. My Ipod broke and I forgot about my apple ID and account for a while. Then when I purchased my Iphone I had set up a different appleID and account and made a few purchases with that account. I would like to install everything I purchased through both accounts but am I only able to have my phone associated with one apple ID and my purchases made with that appleID, or is there a way I can get all of my purchases merged to one apple ID account?

    John Paul Kulusic wrote:
    I made several song purchases with an apple ID that I had set up when I purchased an Ipod. My Ipod broke and I forgot about my apple ID and account for a while. Then when I purchased my Iphone I had set up a different appleID and account and made a few purchases with that account. I would like to install everything I purchased through both accounts but am I only able to have my phone associated with one apple ID and my purchases made with that appleID, or is there a way I can get all of my purchases merged to one apple ID account?
    Any content purchased from the iTunes Store is permanently, and perpetually, and eternally, and I mean like forever, tied to the account from which it was originally purchased.  Apple provides no way to move songs to a different account.
    You can however put songs from multiple accounts into a single iTunes library.

  • Merging document folders from two macs

    Hi, I travel with a macbook air and usually take a copy of my entire "data" folder with me. When I get back to my imac I need to be able to ansfer any new or amended files from the macbook air to my imac. Any suggestions on the most efficient way to do this? Manually takes forever.
    Thank you

    Might want to look at this thread Syncing files and folders between multiple Macs

  • HT201269 Can I sync my music from two different devices if I have two different e mail addresses and apple ids? If so how?

    Can I sync or merge my music from two different devices if I have two different e mail addresses and apple ids? If so how?

    Yes, if you choose the Erase and Sync option (or restore your iPod) you will be allowed to sync your iPod with the new computer.
    If you would like to save the content that's currently on your iPod, see this older thread from another forum member Zevoneer discussing the different ways to copy the content on an iPod back to your PC.
    https://discussions.apple.com/thread/2417169?start=0&tstart=0
    B-rock

  • How can I make a photo from two merged projects available for a book that I started using one project ? They merge but the book only allows me to access the original project photos even though the merged photos can be seen in the project ?

    I have successfully merged two projects in order to add new photos for my book.  The library available to the book which has 26 completed pages accesses only the original project library.  Has anyone else had this problem ?  It is frustrating to see the photos I want in the merged project file, but to have only the original photos when I started the book available in the book library.

    That will work, but it is the long way 'round.
    As Frank noted, Book Albums are just specialized Albums.  Albums can show any Image in your Library, regardless of where the Album is located on the Library Inspector, and regardless of which Project contains the Image.  You can put your Albums anywhere (in a Folder called "Books" for example).  You can put Images from anywhere in your Library in any Album.
    The easy way 'round:
    - Make a new Book Album
    - Select Images you may want to put in your Book.  Flag them.
    - Select some more.  Flag them.
    - Go to the "Flagged" container (listed near the top of the Library Inspector), select all, and drag-and-drop them to your Book Album.
    - Repeat as needed, or just drag-and-drop directly into the Book Album.
    Note that you can remove any Image from any Album (including Books) by selecting and hitting the "{Delete}" key.  This _does not remove the Image from the Project that contains it, or from the Library.
    Note, too, that once the Images are in your Book Album, you then put them in the Book you are creating for publication.  The Book Album contains the superset of Images with which you populate the Book itself.  The Book Album also holds the Book.
    A good (imho ) introduction to the parts of Aperture can be found in this short guide I wrote.
    The User Manual is helpful.  Here is
    the chapter on making Books. 
    From that chapter, here is
    the section detailing how to create and populate a Book Album.

  • Is there any way to merge two WorkSpace screens from different projects

    Is there any convenient way to merge two WorkSpace screens from two different VS projects?
    Thanks.

    I just looked, the property inside the .nivsscreen file for the workspace layout is a big variant... so this won't work.
    Sorry!
    Stephen B

  • Merging two projects with Premiere elements 12.

    Hello,
    On my computer (windows 7) i have different directories with movie-fragments. From each directory i made a movieproject. It took a long time to trim everything. Now i have one project from 1,5 hours and another from 20 minutes. I would like to put the two projects together and then cut it into two projects. I was suprised that i could not do that. I could not copy the movie with titles in one project and copy it to the other project. Also i could not find any way to import one movie into the other. Very strange. I would think that this is a basic function the program should have.
    I found out that i can work of course with the Project Asset and import the moviefragments again, but then i have to trim everything again.
    I could also export one movie as for example AVI and then insert it with the Project Asset into the other project. But then i have no possibility to change the titles and transitions.
    Does anyone know a way to merge two projects?????
    Many thanks, Stephan

    Stephan
    You wrote
    I used it a lot when i worked with the program i used before Premiere Elements.
    Important: What version of Premiere Elements are you referring to in the above? Or, are you referring to another program that is not Premiere Elements?
    No version of Premiere Elements allows the user to open one project file (project.prel file) in another.
    You can copy/paste insert between two project files (project.prel) using ClipMate in conjunction with Premiere Elements. You cannot do a copy/paste insert between projects without ClipMate in use with Premiere Elements. The How To for this Windows Only feature is found
    http://www.atr935.blogspot.com/2013/05/pe-clipmate-copypaste-between-pe.html
    The alternative is to export your project 1 Timeline "trim" selectively to a file saved to the computer hard drive and then import that export into project 2.
    In this workflow considerations need to include project 1 export format consistent with project 2 import settings.
    So, we need details to explain the why not for
    Also i could not find any way to import one movie into the other. Very strange. I would think that this is a basic function the program should have.
    and
    I was suprised that i could not do that. I could not copy the movie with titles in one project and copy it to the other project.
    In the first part, what were your export settings from project 1 and your project preset for project 2.
    In the second part, did you use ClipMate with Premiere Elements or something else?
    What you want to do sounds very doable so we need to discover the whys to get to the solution.
    Thank you.
    ATR

Maybe you are looking for