EPICS Controls Argonne National Laboratory

Experimental Physics and
Industrial Control System

1994  1995  1996  1997  1998  1999  2000  2001  2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  <20162017  2018  2019  2020  2021  2022  2023  2024  Index 1994  1995  1996  1997  1998  1999  2000  2001  2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  <20162017  2018  2019  2020  2021  2022  2023  2024 
<== Date ==> <== Thread ==>

Subject: Re: Guide needed in order to work with the EPICS related Git repositories
From: Bruce Hill <[email protected]>
To: <[email protected]>, <[email protected]>, <[email protected]>
Date: Mon, 22 Feb 2016 22:17:50 -0800
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, [email protected] 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

Replies:
RE: Guide needed in order to work with the EPICS related Git repositories ulrik.pedersen
References:
Guide needed in order to work with the EPICS related Git repositories Jeong Han Lee
RE: Guide needed in order to work with the EPICS related Git repositories Mark Rivers
Re: Guide needed in order to work with the EPICS related Git repositories Jeong Han Lee
RE: Guide needed in order to work with the EPICS related Git repositories ulrik.pedersen
Re: Guide needed in order to work with the EPICS related Git repositories Bruce Hill
RE: Guide needed in order to work with the EPICS related Git repositories ulrik.pedersen

Navigate by Date:
Prev: Re: Problem when building debian package IOC Wang, Lin
Next: RE: Guide needed in order to work with the EPICS related Git repositories ulrik.pedersen
Index: 1994  1995  1996  1997  1998  1999  2000  2001  2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  <20162017  2018  2019  2020  2021  2022  2023  2024 
Navigate by Thread:
Prev: RE: Guide needed in order to work with the EPICS related Git repositories ulrik.pedersen
Next: RE: Guide needed in order to work with the EPICS related Git repositories ulrik.pedersen
Index: 1994  1995  1996  1997  1998  1999  2000  2001  2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  <20162017  2018  2019  2020  2021  2022  2023  2024 
ANJ, 15 Jul 2016 Valid HTML 4.01! · Home · News · About · Base · Modules · Extensions · Distributions · Download ·
· Search · EPICS V4 · IRMIS · Talk · Bugs · Documents · Links · Licensing ·