Do you get the same conflicts if you merge your development branches rather than rebasing? What happens if you merge first, then rebase relative to the current head of master?
From: Osullivan L. [L.Osullivan@swansea.ac.uk]
Sent: Friday, March 08, 2013 10:35 AM
Subject: [VuFind-Tech] Vufind 2 - Development
I'm using Eclipse and trying to work on several local branches of VuFind 2.
I have a Master branch (which I have set up with all the basic config settings plus an ingestion of Marc records) plus several branches which were originally taken from this Master branch for developing small patches plus our local theme customizations. When
the main repository is updated, I fetch and pull on the Master branch and then attempt to rebase the development branches. Unfortunately, every time the remote repository is updated and I try a rebase, I get so many conflicts that have to be manually corrected
that it pretty much defeats the point.
Does anyone have any development strategies they can share?
Swansea University, Singleton Park, Swansea SA2 8PP, UK