Re: Guide needed in order to work with the EPICS related Git repositories

[Bruce Hill <bhill@slac.stanford.edu>]

Hi Ulrik,
Looks like the wiki accepts my contributions, so I updated the page.
See what you think and feel free to modify as you see fit.

Cheers,
- Bruce

On 02/17/2016 02:30 AM, ulrik.pedersen@diamond.ac.uk wrote:

# To submit a patch as a new pull request
1. Make sure your master branch is uptodate
git pull origin master
2. Switch workspace to master prior to creating each new feature staging branch!
git checkout master
3. Create feature staging branch
git checkout -b feature-name
4. Apply patch (or make changes to files directly)
patch --strip 0 -i path_to_patch_file
5. Use git diff and git status to make sure all is well
5a. Be sure to expand all tabs in any changed lines
6. Commit changes to local git repo
git commit -a -m "What this patch does"
7. Push back to orgin on github
git push -u origin feature-name
8. Go to github and submit pull request(s) to developer's fork

This has the advantage of keeping each proposed change on it's own branch
where it can be tweaked or discarded as needed w/o impacting the master branch.

-- 
Bruce Hill
Member Technical Staff
SLAC National Accelerator Lab
2575 Sand Hill Road M/S 10
Menlo Park, CA  94025