[Pulp-list] [devel] IMPORTANT, ACTION REQUIRED: 2.4-dev branch

[Randy Barlow]

On 09/04/2014 10:17 AM, Randy Barlow wrote:
> Hi Pulp developers! Because we have merged fixes into 2.4-dev that will
> not be release in the 2.4.x stream, I have deleted the 2.4-dev branch on
> github. I have also created a new branch with the same name. Because of
> this, you must all take action! Here is what you must do:
> 
> $ git checkout master
> $ git pull
> 
> # This next step will likely give you the warning that 2.4-dev isn't
> fully merged to origin/2.4-dev. This actually makes sense and is
> expected, since 2.4-dev branched from 2.4.1-dev. If you see it not being
> fully merged to origin/master, you must have local commits in your
> 2.4-dev that haven't been merged to master yet.
> $ git branch -d 2.4-dev
> 
> # If all was OK with the above, delete your 2.4-dev for real
> $ git branch -D 2.4-dev
> 
> # Now, checkout the real 2.4-dev branch
> $ git checkout 2.4-dev

I made the mistake of forgetting to do this same thing on our pulp_rpm
and pulp_puppet repos. If you have already done this, you must do it
again on those as I just deleted and recreated the 2.4-dev branches
there. Apologies for the confusion.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/pulp-list/attachments/20140904/78026931/attachment.sig>