-
Notifications
You must be signed in to change notification settings - Fork 93
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Documentation for work flow #138
Milestone
Comments
ghost
pushed a commit
that referenced
this issue
Dec 15, 2016
Add contents for #138 and limit to 70-characters width.
Patch release 4.1.4 has better commit history compared to 4.1.2 and 4.1.3, which were both oversimplified by several pull requests and "squash and merge" option. The Remaining topic "Future work flow" shall be updated after observing next milestones. |
This issue was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
None yet
0 participants
This issue is part of issue #132 that intends to clarify and document the work flow of current interim maintainer @clearkimura. Future contributor may use this work flow as starting point.
Then: Less proper way
What I have been doing as documentation contributor is a linear commit. Push updates to modified documents directly to
master
branch and pages on Wiki. This is straightforward and easy to do for one-time update. But when this way becomes a habit, many commits are pushed just like that without discussion or clarification.Now: More proper way
What I am doing now is "more proper" than before; By creating a new branch from
master
, commit changes, test, repeat cycle, then create pull request to merge changes from the branch tomaster
and finally merge changes to complete the process. Similar to the way explained by GitHub work flow.Yet: How proper
To plan work flow, one need to understand three things on GitHub:
When following work flow, one may realize there are few missing details:
And finally, the work flow itself that illustrated from start to end (perhaps as a text chart?) -- this and all above shall be documented in repository at
docs/workflow.md
.How to text chart
One way is to clone the "old stable" repository to local system and run
git
command to show relevant output. This was hinted by Git documentation in Chapter 3 Git Branching.Example output copied from the link:
This copy-paste method is perhaps more practical and easier than drawing text chart in horizontal direction. No need to create example work flow, just show what we already have and explain.
Purpose of documentation
When the work flow is proper, one can easily see how the project undergoes changes over time. Despite being an interim maintainer for several months now, I am yet to define "proper" work flow.
In related matter, commit history for both 4.1.2 and 4.1.3 might have been oversimplified because I had all changes made into a single pull request and selected "squash and merge" option. This is not necessarily a bad thing, but it is not informative when seeing such commit history.
By documenting the work flow I have tried during this short interim period, future contributors will have some clues before contributing to this project on GitHub. Even better, they could come up with better work flow that I had not discovered.
I hope to include this documentation in the next patch release 4.1.4.
The text was updated successfully, but these errors were encountered: