... t pull upstream main $ # Rebase the pull request on main. $ git checkout pr/#### $ git rebase main $ git checkout main $ # Merge the work as "fast-forward" to main to avoid a merge commit. $ # (in practice, you can omit "--ff-only" since you just reba ... sed) $ git merge --ff-only pr/XXXX $ # If you're not sure if you did things correctly, check that only the $ # changes you expect will be p ... \> REM Rebase the pull request on main. ...\> git checkout pr/#### ...\> git rebase main ...\> git checkout main ...\> REM Merge the work as "fast-forward" to main to avoid a merge commit. ...\> REM (in practice, you can omit "--ff-only" since you jus ... ... t pull upstream main $ # Rebase the pull request on main. $ git checkout pr/#### $ git rebase main $ git checkout main $ # Merge the work as "fast-forward" to main to avoid a merge commit. $ # (in practice, you can omit "--ff-only" since you just reba ... sed) $ git merge --ff-only pr/XXXX $ # If you're not sure if you did things correctly, check that only the $ # changes you expect will be p ... \> REM Rebase the pull request on main. ...\> git checkout pr/#### ...\> git rebase main ...\> git checkout main ...\> REM Merge the work as "fast-forward" to main to avoid a merge commit. ...\> REM (in practice, you can omit "--ff-only" since you jus ... ... e with an open release blocker or to postpone the release date of a non-security release if required. Check with the other mergers to make sure they don't have any uncommitted changes for the release. Proofread the release notes, including looking at ... create a new PR targeting the stable branch of the corresponding release (example PR updating translations for 4.2 ). Once merged, forward port the changes into main ( example commit ). Update the django-admin manual page : $ cd docs $ make man $ man ... o prepare for the next feature release. It should be reviewed and approved a few days before the freeze, allowing it to be merged after the stable branch is cut. The following items should be addressed in this branch: Update the VERSION tuple in djang ... ... e with an open release blocker or to postpone the release date of a non-security release if required. Check with the other mergers to make sure they don't have any uncommitted changes for the release. Proofread the release notes, including looking at ... create a new PR targeting the stable branch of the corresponding release (example PR updating translations for 4.2 ). Once merged, forward port the changes into main ( example commit ). Update the django-admin manual page : $ cd docs $ make man $ man ... o prepare for the next feature release. It should be reviewed and approved a few days before the freeze, allowing it to be merged after the stable branch is cut. The following items should be addressed in this branch: Update the VERSION tuple in djang ... ... creating a fully-ready pull request, you will make the reviewer's job easier, meaning that your work is more likely to be merged into Django. You could also upload a traditional patch to Trac, but it's less practical for reviews. Git のインストール ¶ ... and commit them: git commit When writing the commit message, follow the commit message guidelines to ease the work of the merger. If you're uncomfortable with English, try at least to describe precisely what the commit does. If you need to do additio ... for instance: "all tests pass under SQLite and MySQL". Pull requests at GitHub have only two states: open and closed. The merger who will deal with your pull request has only two options: merge it or close it. For this reason, it isn't useful to make ... ... creating a fully-ready pull request, you will make the reviewer's job easier, meaning that your work is more likely to be merged into Django. You could also upload a traditional patch to Trac, but it's less practical for reviews. Git のインストール ¶ ... and commit them: git commit When writing the commit message, follow the commit message guidelines to ease the work of the merger. If you're uncomfortable with English, try at least to describe precisely what the commit does. If you need to do additio ... for instance: "all tests pass under SQLite and MySQL". Pull requests at GitHub have only two states: open and closed. The merger who will deal with your pull request has only two options: merge it or close it. For this reason, it isn't useful to make ... ... rclass ( #24354 ). Stopped writing migration files in dry run mode when merging migration conflicts. When makemigrations --merge is called with verbosity=3 the migration file is written to stdout ( #24427 ). 目次 Django 1.7.7 リリースノート Denial-of- ... ... rclass ( #24354 ). Stopped writing migration files in dry run mode when merging migration conflicts. When makemigrations --merge is called with verbosity=3 the migration file is written to stdout ( #24427 ). 目次 Django 1.7.7 リリースノート Denial-of- ... ... ned control when the global settings are not sufficient. Applying these overrides fully replaces the base CSP: they do not merge with existing rules. They can be used alongside the constants defined in CSP . 警告 Weakening or disabling a CSP policy on ... ... ned control when the global settings are not sufficient. Applying these overrides fully replaces the base CSP: they do not merge with existing rules. They can be used alongside the constants defined in CSP . 警告 Weakening or disabling a CSP policy on ... 2026年10月08日