Skip to content
This repository has been archived by the owner on Sep 5, 2024. It is now read-only.

docs(pull-requests): add link to Github's Amending guide #11498

Merged
merged 1 commit into from
Nov 1, 2018
Merged

docs(pull-requests): add link to Github's Amending guide #11498

merged 1 commit into from
Nov 1, 2018

Conversation

jagmeetb
Copy link
Contributor

PR Checklist

Please check that your PR fulfills the following requirements:

  • The commit message follows our guidelines
  • Tests for the changes have been added or this is not a bug fix / enhancement
  • Docs have been added, updated, or were not required

PR Type

What kind of change does this PR introduce?

[ ] Bugfix
[ ] Enhancement
[X] Documentation content changes
[ ] Code style update (formatting, local variables)
[ ] Refactoring (no functional changes, no api changes)
[ ] Build related changes
[ ] CI related changes
[ ] Infrastructure changes
[ ] Other... Please describe:

What is the current behavior?

Issue Number: fixes #11473

Going through the current steps requires contributors to deal with Git Interactive Rebase which is confusing and may be error prone for first time contributors.

What is the new behavior?

  • Added link to Github's Amending guide
  • Replaced git rebase command with git commit -a --amend
  • Corrected the git push --force command that was suggested

Does this PR introduce a breaking change?

[ ] Yes
[X] No

Other information

@jagmeetb
docs(pull-requests): add link to Github's Amending guide
4aaf305 
add link to amend guide
replace suggested rebase commands with amend

fixes angular#11473
@googlebot googlebot added the cla: yes PR author has signed Google's CLA: https://opensource.google.com/docs/cla/ label Oct 30, 2018
@Splaktar Splaktar self-requested a review October 31, 2018 04:57
Splaktar
Splaktar approved these changes Oct 31, 2018
View reviewed changes
Copy link
Member

@Splaktar Splaktar left a comment

Choose a reason for hiding this comment

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

LGTM

@Splaktar Splaktar added this to the 1.1.11 milestone Oct 31, 2018
@Splaktar Splaktar added type: docs pr: merge ready This PR is ready for a caretaker to review pr: merge safe P4: minor Minor issues. May not be fixed without community contributions. labels Oct 31, 2018
@jelbourn jelbourn added pr: merge ready This PR is ready for a caretaker to review and removed pr: merge ready This PR is ready for a caretaker to review labels Nov 1, 2018
@jelbourn jelbourn merged commit 4e8bef8 into angular:master Nov 1, 2018
marosoft pushed a commit to marosoft/material that referenced this pull request Nov 11, 2018
@jagmeetb @marosoft
docs(pull-requests): add link to Github's Amending guide (angular#11498)
aeb84be 
* add link to amend guide
* replace suggested rebase commands with amend

fixes angular#11473
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@jelbourn jelbourn jelbourn left review comments

@Splaktar Splaktar Splaktar approved these changes

Assignees

@jelbourn jelbourn

Labels
cla: yes PR author has signed Google's CLA: https://opensource.google.com/docs/cla/ P4: minor Minor issues. May not be fixed without community contributions. pr: merge ready This PR is ready for a caretaker to review type: docs
Projects
None yet
Milestone
1.1.11
Development

Successfully merging this pull request may close these issues.

docs(pull-requests): add link to GitHub's Amending older or multiple commit messages Guide
4 participants
@jagmeetb @jelbourn @Splaktar @googlebot