HTTP/2 200
date: Fri, 10 Oct 2025 20:17:52 GMT
content-type: text/html; charset=utf-8
django-composition: Swinging With Django
nel: {"report_to":"heroku-nel","response_headers":["Via"],"max_age":3600,"success_fraction":0.01,"failure_fraction":0.1}
referrer-policy: same-origin
report-to: {"group":"heroku-nel","endpoints":[{"url":"https://nel.heroku.com/reports?s=QVovGqWamWtcUncj%2F0jXzWiGUJTpJCu9%2FWe7qQIrCR4%3D\u0026sid=c46efe9b-d3d2-4a0c-8c76-bfafa16c5add\u0026ts=1760127472"}],"max_age":3600}
reporting-endpoints: heroku-nel="https://nel.heroku.com/reports?s=QVovGqWamWtcUncj%2F0jXzWiGUJTpJCu9%2FWe7qQIrCR4%3D&sid=c46efe9b-d3d2-4a0c-8c76-bfafa16c5add&ts=1760127472"
server: cloudflare
via: 1.1 heroku-router
x-content-type-options: nosniff
cf-cache-status: MISS
last-modified: Fri, 10 Oct 2025 20:17:52 GMT
vary: accept-encoding
content-encoding: gzip
cf-ray: 98c8cdbebab048e0-BOM
alt-svc: h3=":443"; ma=86400
Simon Willison on merge
2 posts tagged “merge”
2008
newforms-admin branch has been merged into trunk.
Congrats to Brian Rosner for the merge. django.newforms has been renamed to django.forms as well—1.0 grows ever closer.
# 20th July 2008,
11:17 pm
/ brian-rosner, django, django-admin, forms, merge, newformsadmin
Undo commit in subversion.
svn merge -r 1708:1707—I can never remember how to do this.
# 3rd January 2008,
4:43 pm
/ merge, subversion, svn, undo