-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Today we had a commit from github.com/pulp's 2.6-release branch get deleted. Unfortunately, this means that anyone who fetched the repository today will have a broken local copy of the repository. The symptom will be that "git pull" on the 2.6-release branch will cause a merge commit, bringing back the commit that was deleted. Also, you will see the commit b480e7db1204a50769fd8dc0de96fe6f46b4ee9f in the 2.6-release branch.
To fix this, you will need to reset your local 2.6-release branch against the upstream 2.6-release branch. You can do that with this command: $ git checkout 2.6-release && git reset --hard upstream/2.6-release Check that the commit is no longer present in your branch by making sure this command does not have any output: $ git branch --contains b480e7db1204a50769fd8dc0de96fe6f46b4ee9f If the above has no output, you are done. If it does, you will have to rebase your branches that have that commit against the new 2.6-release branch that you reset above to remove the deleted commit. Let me know if you have any issues, and apologies for the inconvenience! - -- Randy Barlow -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCgAGBQJVbhi5AAoJEIyFaKUJtmpipF0P/0ors58LuJpepdKDacFIIs1O fM5/8g0Y8OavQMCzkFC3+MgZNM+7g24mErzeoLX2nLv4T+cWJES+r5yBTJ2tDeBK I3ELfzbNYFQo5cqBncIqEt0tmf1OEzt9agoaFq4rU3wKuwS7EaYNYTcI5L0VBrhv iGz3drIVWozJ4qJe/EHOidpaZ7RzjCSr7QpQHW/twxeHDR+54bw6NpSxr3zvbnvY HUiiTJCwu99C9uU4vPwfDZOjevrxz9PLIf2szmQzeGxMVZf1hJvSEyBV0Z50cw+G eXukc60J3LR+6p0zLQ0Eu0yIuMVenAIBG+Q5OOe/MlOSfHSfEDjJwBbRtLgvtHI0 v5a8H1uNBZBOwcj//GiOMa/+vcEeBjAI4n85SKAGTY+hpoPQDsYeDHTqQCrxH3jd z3mUk5gJqwBi1xrztsLJdoS8pDZm7bU0brJMGkwjLevzy+tcAfiEMrB4yfE9TOVN AHJLRKtzZIh8uNgQrZKPSEVdJbUsLp+hgnHNTXEyXZU6k/W/e8+vOV1WDe9xPKSy UsKn3z2y+tzI9ZxWg6PcEDA/HnqZ0tzjRu6igf7lUim7/RM0Fb4p4xW+lVjcmUMs /QoSN6TImmX0TDcPQxCcXBxANJZ2NYaH1W28XH6dB1SwNoktKzSKDENqBkPFqVtN op34gYPBPMT1TrmX9i+U =7dt3 -----END PGP SIGNATURE----- _______________________________________________ Pulp-list mailing list Pulp-list@redhat.com https://www.redhat.com/mailman/listinfo/pulp-list