0
Commit Graph

11 Commits

Author SHA1 Message Date
Toby Huang
fb6382653e [Doc] Add tip about build, hashtags and not using blanket stamps
This CL adds four miscellaneous tips to commit_checklist.md. Firstly,
use CL hashtags to group related CLs together. Secondly, don't use
chrome/OWNERS as a blanket stamp to land your CL if your CL makes
significant changes to subsystems. Thirdly, this CL adds a link to
instructions for building various targets. Fourthly, this CL adds a
tip about auto-submit.

Bug: None
Change-Id: Iaa3c51b8e2b4a49947061762f3a080a858f41fdd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2369619
Commit-Queue: Toby Huang <tobyhuang@chromium.org>
Reviewed-by: Michael Giuffrida <michaelpg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#809018}
2020-09-21 20:11:00 +00:00
Toby Huang
2c40fc5a1f Add comment about fixing merge conflicts
When working with downstream branches chained to upstream branches, it
helps to use `git rebase -i @{u}` twice to pull upstream changes into
the downstream branch. Expect a lot of merge conflicts when you do
this, as git is often not smart enough to figure out which change
happened more recently, and should take precedence.

Bug: None
Change-Id: Ic742439981d6d63e8d6bd1e10776fa920c88eb7f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2341387
Reviewed-by: Michael Giuffrida <michaelpg@chromium.org>
Commit-Queue: Toby Huang <tobyhuang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#796561}
2020-08-10 21:44:40 +00:00
Toby Huang
c9bd85b186 [Documentation change] Modify commit_checklist.md
This CL adds tips about running try jobs and providing patchset titles
to commit_checklist.md.

Bug: None
Change-Id: I25ce9742b7b4f60fd165525cbf2baf5d06dcfa59
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2321835
Commit-Queue: Toby Huang <tobyhuang@chromium.org>
Reviewed-by: Michael Giuffrida <michaelpg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#793376}
2020-07-30 22:02:35 +00:00
Toby Huang
acb9bebae0 [Documentation change] Add more tips to commit_checklist.md
Added a reminder to switch to the correct branch and to rebase any
changes from the upstream branch before resuming development work.

Bug: None
Change-Id: I7828562118825feab8b4a8d322f31bca17f77070
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2262119
Commit-Queue: Toby Huang <tobyhuang@chromium.org>
Reviewed-by: Aga Wronska <agawronska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#782617}
2020-06-25 20:08:04 +00:00
Toby Huang
0a0375c5bc Documentation-only: respond to Mark's comments on commit_checklist.md
This CL responds to Mark Goldstein's comments on commit_checklist.md.
Mark Goldstein was my instructor for the Technical Writing One course,
and as a follow-up exercise, he asked us to include him as a reviewer
on a documentation-related change. This doc will also form the basis
of my upcoming talk "Life of a CL" at Chrome University, so I want to
make sure it's in tip-top form!

Bug: None
Change-Id: I0aeefcbb149929969f15d375f55ea2d2d44684f5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2045051
Reviewed-by: Aga Wronska <agawronska@chromium.org>
Commit-Queue: Toby Huang <tobyhuang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#743465}
2020-02-21 08:00:28 +00:00
Toby Huang
30496d0045 Documentation-only change to commit_checklist.md about @{u} tip in git
Add tip about @{u} as short-hand for the upstream branch when trying
to squash commits using `git rebase -i @{u}`.

Bug: None
Change-Id: I8b06ccdb976fdfe84eac858d3871fac8f85c2f74
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1993498
Reviewed-by: Aga Wronska <agawronska@chromium.org>
Commit-Queue: Toby Huang <tobyhuang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#729862}
2020-01-09 19:45:24 +00:00
Toby Huang
5c3c00eaf9 Add steps for crbug management to commit_checklist.md documentation
Add reminders to mark the crbug as "started" before starting
development work and to mark the crbug as "fixed" after landing the
CL.

Bug: None
Change-Id: Id79ff0843679c368773b10d22ea9d72e4b1691d2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1891730
Reviewed-by: Aga Wronska <agawronska@chromium.org>
Commit-Queue: Toby Huang <tobyhuang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#711042}
2019-10-30 23:29:05 +00:00
Toby Huang
e43e5d684d Define intended audience for commit_checklist.md documentation
I added a sentence defining the intended audience for the "Commit
Checklist for Chromium Workflow" documentation.

Bug: None
Change-Id: Ia2f48d4120e99735c6370c864c52f0b89f6d1feb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1846396
Reviewed-by: Michael Giuffrida <michaelpg@chromium.org>
Commit-Queue: Toby Huang <tobyhuang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#703893}
2019-10-08 21:26:07 +00:00
Toby Huang
242a9f54c4 Edit commit_checklist.md to add tip for Nooglers switching from svn.
Bug: None
Change-Id: I9cabd2e8f87879d4dfbaa1178917fa767008c693
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1802016
Reviewed-by: Aga Wronska <agawronska@chromium.org>
Commit-Queue: Toby Huang <tobyhuang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#696242}
2019-09-13 00:23:23 +00:00
Toby Huang
ba5bbb4624 Add step describing how to squash commits to commit_checklist.md
Add step in commit_checklist.md for squashing commits into a single
commit on the local branch before running `git rebase-update` to avoid
commit-by-commit merge conflicts.

Bug: None
Change-Id: Icccf48d6fe739a3f20f8dd3f7d101ecdad46e3a4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1784162
Commit-Queue: Toby Huang <tobyhuang@chromium.org>
Reviewed-by: Aga Wronska <agawronska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#693427}
2019-09-04 23:23:07 +00:00
Toby Huang
5105f81d0b Add Chromium commit checklist to contributing.md
R=agawronska

Bug: None
Change-Id: Ic6ab4fd47ffbe272252a350e133d383d386a911e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1723301
Commit-Queue: Toby Huang <tobyhuang@chromium.org>
Reviewed-by: Aga Wronska <agawronska@chromium.org>
Reviewed-by: Michael Giuffrida <michaelpg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#685403}
2019-08-08 23:47:57 +00:00