Changes between Version 2 and Version 3 of CommittingYourChanges

Timestamp:

07/01/15 10:43:13 (9 years ago)

Author:

jdreed

Comment:

--

CommittingYourChanges

@@ -20 +20 @@
 * Commit your changes, and push them to **your** remote.  Submit a pull request as [wiki:WorkingWithGithub described here], and wait for code review, or decide that this is important enough that it doesn't need code review.
 
+Once your pull request is approved (or you have decided to approve it yourself):
 * Tag your most recent commit with the version number (this MUST match the version number as described above).
  * `git tag -a 10.0.3 a4b5c6d7`
@@ -37 +38 @@
  * The upstream component of the version **must** match the tag in `master`, and the distro-specific component should be `-0debathena1`, incrementing the last digit as necessary, if there are packaging-only changes.  For example, using version `10.0.3` as above, the entry in `debian/changelog` should be `10.0.3-0debathena1`.  
 * Commit your changes.
-**NOTE**: If the changes to packaging are more complicated than a new changelog entry (e.g. if you're changing maintainer scripts, or the `rules` file), push to **your** remote, and submit another pull request.
+ * If the changes to packaging are more complicated than a new changelog entry (e.g. if you're changing maintainer scripts, or the `rules` file), push to **your** remote, and submit another pull request.
 * Push to `origin`:
  * `git push origin debian`