cesy: "Cesy" - An old-fashioned quill and ink (Default)
Cesy ([personal profile] cesy) wrote in [site community profile] dw_dev_training 2012-08-31 08:56 pm (UTC)

That pull request just merges one commit, the one for 4072. https://github.com/dreamwidth/dw-free/pull/35 merges 4606.

https://github.com/ninetyd/dw-free/compare/develop...bug4606/moderated_entry shows that there's nothing in 4606 that's not in develop at the moment. Can you try making sure you've pushed the latest version of both to your fork?

One other thing I sometimes end up having to do is rebasing, if everything's got too mixed up, e.g. if you built on other pull requests that then got merged in a different order from how you built on them. So if you rebase 4606 onto develop, then try to -d, sometimes that solves it. And if it doesn't, it'll show up much more clearly what's missing.

Post a comment in response:

This account has disabled anonymous posting.
If you don't have an account you can create one now.
HTML doesn't work in the subject.
More info about formatting