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