gawkworkflow: Developing fixes

1 
1 5.5 Developing Fixes
1 ====================
1 
1 If you want to make a fix on 'master' or on the current stable branch,
1 you work the same way, by producing and discussing a diff on the mailing
1 list.  Once it's approved, you can commit it yourself:
1 
1      $ git checkout master     Move to master
1      $ git pull                Make sure we're up to date with the maintainer
1      $ gvim ...                Make any fixes, compile, test
1      $ git diff                Review your changes
1      $ git add ...             Add any files for committing
1      $ git commit              Commit the files. Include a commit message.
1 
1    When you're ready to push your changes:
1 
1      $ git pull                Download latest version; Git will merge
1      $ gvim ...                Resolve any merge conflicts with git add and git commit
1      $ git push                Now you can push your changes upstream
1 
1    ⇒Merge Conflicts for instructions on dealing with merge
1 conflicts.
1