Re: [Banshee-List] coordinating new updates once a patch has been applied (newbie git question)

[Alexander Kojevnikov <alexander kojevnikov com>]

2009/6/18 David Fox <dfox94085 gmail com>:
> A quick question if I may.
>
> I have been using 'git pull' on the banshee 1.5.0 repository regularly
> getting new updates and installing them.
>
> Some time back, I applied a youtube patch to the banshee sources and
> rebuilt it.
>
> Now I am getting an error "configure.ac entry is out of date; cannot
> merge" that is keeping me from applying new updates.
>
> Do I have to reverse the patch, and then update & reapply, or
> (hopefully) is there a better solution?
>

You can 'git pull --rebase'. However, it's easier to just never change
the master branch. If you want to apply a patch, create a new local
branch and work on it.

Cheers,
Alex