Christian is running a script that every 5 minutes mirrors the SF repo onto the Github one - and only ever in that direction. This means any changes you make using Github (merging, deleting branches) will have no permanent effect. Your sf#396 branch is still present on both the SF and GH repos.
To effectively merge it, you will need to merge it and push it to the SF repo. Please do this by rebasing and an FF-only merge, not with a merge commit :-) You'll then be able to tidily delete your sf#396 branch, on the SF repo, which will then get reflected on the GH repo in due course. Ed -----Original Message----- From: Derek Lamb Sent: Friday, September 18, 2015 6:57 PM To: pdl-devel Subject: [Pdl-devel] question about github / SF interoperability Question about PDL's GitHub / SF interoperability. A couple weeks ago I pushed the branch sf#396 to SF. Soon thereafter it showed up on GitHub. I then initiated a pull requested from GitHub. After a while it passed all the checks, so I let it sit for a week or so. Seeing no up- or down-votes, I used the GitHub web interface to merge branch sf#396 into master. It said I was OK to delete the branch, so I did. I assumed there would be an automatic push up to SF. When I look up that branch in SF I get an error (presumably the branch is gone but still lists in the branch list for some reason?). But I'm not seeing the commit in either the SF master, or now even in GitHub master. I just noticed that Christian Walde restored the sf#396 branch 3 minutes after I deleted it. The commit is still there. But I don't see where the merge into master was un-done (if it was), or why. https://github.com/PDLPorters/pdl/pull/148 So, what gives? Does the GitHub repo automatically push to SF? And where did my merge to master go? thanks, Derek ------------------------------------------------------------------------------ _______________________________________________ pdl-devel mailing list pdl-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/pdl-devel ------------------------------------------------------------------------------ _______________________________________________ pdl-devel mailing list pdl-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/pdl-devel
