mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-05 01:40:04 +00:00
bb25f85ce8
This was intended to be a small followup for https://github.com/go-gitea/gitea/pull/23712, but...here we are. 1. Our docs currently use `slug` as the entire URL, which makes refactoring tricky (see https://github.com/go-gitea/gitea/pull/23712). Instead, this PR attempts to make future refactoring easier by using slugs as an extension of the section. (Hugo terminology) - What the above boils down to is this PR attempts to use directory organization as URL management. e.g. `usage/comparison.en-us.md` -> `en-us/usage/comparison/`, `usage/packages/overview.en-us.md` -> `en-us/usage/packages/overview/` - Technically we could even remove `slug`, as Hugo defaults to using filename, however at least with this PR it means `slug` only needs to be the name for the **current file** rather than an entire URL 2. This PR adds appropriate aliases (redirects) for pages, so anything on the internet that links to our docs should hopefully not break. 3. A minor nit I've had for a while, renaming `seek-help` to `support`. It's a minor thing, but `seek-help` has a strange connotation to it. 4. The commits are split such that you can review the first which is the "actual" change, and the second is added redirects so that the first doesn't break links elsewhere. --------- Signed-off-by: jolheiser <john.olheiser@gmail.com>
70 lines
2.8 KiB
Markdown
70 lines
2.8 KiB
Markdown
---
|
|
date: "2018-06-01T19:00:00+02:00"
|
|
title: "Pull Request"
|
|
slug: "pull-request"
|
|
weight: 13
|
|
toc: false
|
|
draft: false
|
|
aliases:
|
|
- /en-us/pull-request
|
|
menu:
|
|
sidebar:
|
|
parent: "usage"
|
|
name: "Pull Request"
|
|
weight: 13
|
|
identifier: "pull-request"
|
|
---
|
|
|
|
# Pull Request
|
|
|
|
A Pull Request (PR) is a way to propose changes to a repository.
|
|
It is a request to merge one branch into another, accompanied by a description of the changes that were made.
|
|
Pull Requests are commonly used as a way for contributors to propose changes and for maintainers to review and merge those changes.
|
|
|
|
## Creating a pull request
|
|
|
|
To create a PR, you'll need to follow these steps:
|
|
|
|
1. **Fork the repository** - If you don't have permission to make changes to the repository directly, you'll need to fork the repository to your own account.
|
|
This creates a copy of the repository that you can make changes to.
|
|
|
|
2. **Create a branch (optional)** - Create a new branch on your forked repository that contains the changes you want to propose.
|
|
Give the branch a descriptive name that indicates what the changes are for.
|
|
|
|
3. **Make your changes** - Make the changes you want, commit, and push them to your forked repository.
|
|
|
|
4. **Create the PR** - Go to the original repository and go to the "Pull Requests" tab. Click the "New Pull Request" button and select your new branch as the source branch.
|
|
Enter a descriptive title and description for your Pull Request and click "Create Pull Request".
|
|
|
|
## Reviewing a pull request
|
|
|
|
When a PR is created, it triggers a review process. The maintainers of the repository are notified of the PR and can review the changes that were made.
|
|
They can leave comments, request changes, or approve the changes.
|
|
|
|
If the maintainers request changes, you'll need to make those changes in your branch and push the changes to your forked repository.
|
|
The PR will be updated automatically with the new changes.
|
|
|
|
If the maintainers approve the changes, they can merge the PR into the repository.
|
|
|
|
## Closing a pull request
|
|
|
|
If you decide that you no longer want to merge a PR, you can close it.
|
|
To close a PR, go to the open PR and click the "Close Pull Request" button. This will close the PR without merging it.
|
|
|
|
## "Work In Progress" pull requests
|
|
|
|
Marking a pull request as being a work in progress will prevent that pull request from being accidentally merged.
|
|
To mark a pull request as being a work in progress, you must prefix its title by `WIP:` or `[WIP]` (case insensitive).
|
|
Those values are configurable in your `app.ini` file:
|
|
|
|
```ini
|
|
[repository.pull-request]
|
|
WORK_IN_PROGRESS_PREFIXES=WIP:,[WIP]
|
|
```
|
|
|
|
The first value of the list will be used in helpers.
|
|
|
|
## Pull Request Templates
|
|
|
|
You can find more information about pull request templates at the page [Issue and Pull Request templates](../issue-pull-request-templates).
|