Hi Karl-
I was wondering how things are going with the SciPDL work?
I made a git branch on the sf.net repo ( karl-f77-fixes ) that
you can use as the starting point for your additions. Here
is a cheat sheet of working with the current PDL workflow
as applies to the stable PDL repository at sf.net:
On Mon, Sep 21, 2015 at 1:49 PM, Derek Lamb <de...@boulder.swri.edu
<mailto:de...@boulder.swri.edu>>wrote:
Thanks, Ed. I hadn't realized that was unidirectional, and that it
was a user-implemented thing. I think I saw something at SF about
how to mirror a GH project, so I thought it went both ways.
So the recommended workflow is (from memory, I probably got some
detail or option wrong):
git pull origin master #update local repository
git checkout -b problembranch #create a local branch
#fix a problem
git add filename(s) #add files to staging area
git commit #commit the changes to the
local problembranch
git push origin problembranch #push the branch to SF
# After a few minutes, log into GH, go to problembranch and initiate
a pull request
# Wait for the automatic build tests to run and pass
# Wait for somebody to look at and approve the code if it is complicated
# DON'T merge and delete the branch on GH, ignore the tempting buttons
git rebase master #rebase the branch onto master
git checkout master #still rebasing
git merge problembranch —ff-only #finally done rebasing
git push origin master #push to SF
git push origin :problembranch #delete the remote branch
git branch -d problembranch #delete the local branch
Cheers,
Chris
------------------------------------------------------------------------------
_______________________________________________
pdl-devel mailing list
pdl-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/pdl-devel
