Commitb35e62b

committed

[Contributing] Clarify the rebase operation

I just mentioned the fact that `push -f` is usually required when rebasing and explicit that the "2.2 when bugfixing" is a follow up on the previous example (Not necessarily explicit at first).

1 parent780cd22 commitb35e62bCopy full SHA for b35e62b

File tree

1 file changed

-2

lines changed

contributing/code
- patches.rst

1 file changed

-2

lines changed

`‎contributing/code/patches.rst`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,8 @@ while to finish your changes):`
`228`	`228`
`229`	`229`	`..tip::`
`230`	`230`
`231`		- Replace `master` with `2.2` if you are working on a bugfix
	`231`	+ Replace ``master`` with the branch you selected previously (e.g. ``2.2``)
	`232`	`+ if you are working on a bugfix`
`232`	`233`
`233`	`234`	When doing the ``rebase`` command, you might have to fix merge conflicts.
`234`	`235`	``git status`` will show you the unmerged files. Resolve all the conflicts,
`@@ -243,7 +244,7 @@ Check that all tests still pass and push your branch remotely:`
`243`	`244`
`244`	`245`	`..code-block::bash`
`245`	`246`
`246`		`- $ git push origin BRANCH_NAME`
	`247`	`+ $ git push-forigin BRANCH_NAME`
`247`	`248`
`248`	`249`	`Make a Pull Request`
`249`	`250`	`~~~~~~~~~~~~~~~~~~~`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commitb35e62b

File tree

1 file changed

1 file changed

`‎contributing/code/patches.rst`

0 commit comments