Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Use valid version in maintainer guide #13175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 19, 2020
Merged

Use valid version in maintainer guide #13175

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Use valid version in maintainer guide
  • Loading branch information
@OskarStark
OskarStark committed Feb 18, 2020
commit 2a596deb83d2f8c4c3e479db7f6b301878edcd8d
20 changes: 10 additions & 10 deletions 20 _build/maintainer_guide.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ usually simple to fix:
...

Unable to rebase the patch for <comment>pull/11183</comment>
The command "'git' 'rebase' '--onto' '3.4' '4.2' 'pull/11160'" failed.
The command "'git' 'rebase' '--onto' '3.4' '4.4' 'pull/11160'" failed.
Exit Code: 128(Invalid exit argument)

[...]
Expand Down Expand Up @@ -195,7 +195,7 @@ Step 3: Merge it into the other branches

If a PR has not been merged in ``master``, you must merge it up into all the
maintained branches until ``master``. Imagine that you are merging a PR against
``3.4`` and the maintained branches are ``3.4``, ``4.2`` and ``master``:
``3.4`` and the maintained branches are ``3.4``, ``4.4`` and ``master``:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would add 5.0 though

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do this while upmerging 👍🏻


.. code-block:: terminal

Expand All @@ -208,16 +208,16 @@ maintained branches until ``master``. Imagine that you are merging a PR against
$ git push origin
$ git push upstream

$ git checkout 4.2
$ git merge upstream/4.2
$ git checkout 4.4
$ git merge upstream/4.4
$ git merge --log 3.4
# here you can face several errors explained later
$ git push origin
$ git push upstream

$ git checkout master
$ git merge upstream/master
$ git merge --log 4.2
$ git merge --log 4.4
$ git push origin
$ git push upstream

Expand Down Expand Up @@ -257,7 +257,7 @@ easy to spot because you'll see lots of conflicts:

# DON'T DO THIS! It's a wrong branch merge
$ git checkout 3.4
$ git merge upstream/4.2
$ git merge upstream/4.4

As long as you don't push this wrong merge, there's no problem. Delete your
local branch and check it out again:
Expand All @@ -278,8 +278,8 @@ When merging things to upper branches, most of the times you'll see conflicts:

.. code-block:: terminal

$ git checkout 4.2
$ git merge upstream/4.2
$ git checkout 4.4
$ git merge upstream/4.4
$ git merge --log 3.4

Auto-merging security/entity_provider.rst
Expand Down Expand Up @@ -314,8 +314,8 @@ were modified by the PR but no longer exist in newer branches:

.. code-block:: terminal

$ git checkout 4.2
$ git merge upstream/4.2
$ git checkout 4.4
$ git merge upstream/4.4
$ git merge --log 3.4

Auto-merging translation/debug.rst
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.