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

[<ulrik.pedersen@diamond.ac.uk>]

Hi Bruce,

 

Thanks for the contribution! It looks fine to me.

 

I was slightly horrified to notice that our wiki is open to edit by *anyone* with a github account (bots, spammers, and scammers welcome…) That seems like a little too permissive default setting so I’m changing that now.

 

Of course we are still happy to receive wiki contributions emailed to myself, tech-talk or the areaDetector mailing list.

 

Cheers,

Ulrik

 

From: Bruce Hill [mailto:bhill@slac.stanford.edu]
Sent: 23 February 2016 06:18
To: Pedersen, Ulrik (DLSLtd,RAL,TEC); rivers@cars.uchicago.edu; tech-talk@aps.anl.gov
Subject: Re: Guide needed in order to work with the EPICS related Git repositories

 

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

 

-- 

This e-mail and any attachments may contain confidential, copyright and or privileged material, and are for the use of the intended addressee only. If you are not the intended addressee or an authorised recipient of the addressee please notify us of receipt by returning the e-mail and do not use, copy, retain, distribute or disclose the information in or attached to the e-mail.
Any opinions expressed within this e-mail are those of the individual and not necessarily of Diamond Light Source Ltd.
Diamond Light Source Ltd. cannot guarantee that this e-mail or any attachments are free from viruses and we cannot accept liability for any damage which you may sustain as a result of software viruses which may be transmitted in or with the message.
Diamond Light Source Limited (company no. 4375679). Registered in England and Wales with its registered office at Diamond House, Harwell Science and Innovation Campus, Didcot, Oxfordshire, OX11 0DE, United Kingdom