Hi Demian,

Thanks for your advice here! I tried it and it works a lot better than rebasing as you suggest. It also works like a dream using the Eclipse plugin too.

Thanks,

Luke

On 03/08/2013 03:58 PM, Demian Katz wrote:
I mean, in command-line syntax:

git checkout master
git pull
git checkout my-branch
git merge master

Do you still get conflicts if you take this route?

If that merges cleanly, then you should be able to rebase after the merge to get your history back in a straight line again.

- Demian

From: Osullivan L. [L.Osullivan@swansea.ac.uk]
Sent: Friday, March 08, 2013 10:53 AM
To: Demian Katz
Cc: vufind-tech@lists.sourceforge.net
Subject: Re: Vufind 2 - Development

Hi Demian,

Do you mean try merging my local master with the origin master first?

Cheers,

Luke

On 03/08/2013 03:38 PM, Demian Katz wrote:
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?

- Demian

From: Osullivan L. [L.Osullivan@swansea.ac.uk]
Sent: Friday, March 08, 2013 10:35 AM
To: vufind-tech@lists.sourceforge.net
Subject: [VuFind-Tech] Vufind 2 - Development

Hi Folks,

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?

Thanks,

Luke
-- 
Luke O'Sullivan
Systems Developer
Web Team
Swansea University, Singleton Park, Swansea SA2 8PP, UK
l.osullivan@swansea.ac.uk
01792 602772
@l_os_cymru

-- 
Luke O'Sullivan
Systems Developer
Web Team
Swansea University, Singleton Park, Swansea SA2 8PP, UK
l.osullivan@swansea.ac.uk
01792 602772
@l_os_cymru

-- 
Luke O'Sullivan
Systems Developer
Web Team
Swansea University, Singleton Park, Swansea SA2 8PP, UK
l.osullivan@swansea.ac.uk
01792 602772
@l_os_cymru