Commit 6daf1508 authored by Evan Read's avatar Evan Read

Merge branch 'doc-psureshbabu-master-patch-70862' into 'master'

Doc | Add details about allowed to force push

See merge request gitlab-org/gitlab!70032
parents 0a59616f a68b4d3b
...@@ -228,8 +228,13 @@ git push --force-with-lease origin my-feature-branch ...@@ -228,8 +228,13 @@ git push --force-with-lease origin my-feature-branch
``` ```
If the branch you want to force-push is [protected](../../user/project/protected_branches.md), If the branch you want to force-push is [protected](../../user/project/protected_branches.md),
you can't force-push to it unless you unprotect it first. Then you can you can't force push to it unless you either:
force-push and re-protect it.
- Unprotect it.
- [Allow force push](../../user/project/protected_branches.md#allow-force-push-on-a-protected-branch)
to it.
Then you can force push and protect it again.
## Merge conflicts ## Merge conflicts
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment