[Deploying Sakai] Clarification on Github process
D. Stuart Freeman
stuart.freeman at et.gatech.edu
Thu Feb 19 11:59:59 PST 2015
In the event that you accidentally commit to master instead of a feature
branch it's really easy to fix:
git branch SAK-XYZ # make a copy of what we've done so far in a branch
git reset --hard sakaiproject/master # match current branch to upstream
git checkout SAK-XYZ # resume work on feature branch
On Thu, Feb 19, 2015 at 12:53:41PM -0500, Neal Caidin wrote:
> Hi All,
> Today on the Sakai core team call we discussed the Git/Github workflow.
> My understanding is that the team recommendation is:
> Create a Jira for your issue (feature, bug, etc), as always
> Create a branch
> branch name should use Jira id
> Work only in branch, not on the master
> no changes in master, ever.
> Master is "the branch you receive changes through for upstream repo"
> The Confluence page that reflects this process:
> I hope that is clear. Apparently things can get a little tricky if you
> commit to your master branch directly, as it is primarily intended as a
> way to keep up with the upstream master.
> Feel free to ask questions (which probably others will answer ;-) ).
> Visible links
> 1. https://confluence.sakaiproject.org/display/PMC/Migrating+from+SVN+to+Git%3A+SVN+contrib+committers+-%3E+Git+authors
> production mailing list
> production at collab.sakaiproject.org
> TO UNSUBSCRIBE: send email to production-unsubscribe at collab.sakaiproject.org with a subject of "unsubscribe"
D. Stuart Freeman
Georgia Institute of Technology
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Size: 181 bytes
Desc: Digital signature
Url : http://collab.sakaiproject.org/pipermail/production/attachments/20150219/8cb30c1e/attachment.bin
More information about the production