Skip to content
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

Docs: Add clarification about git workflow #13534

Merged
merged 8 commits into from
Jan 31, 2019
Merged

Docs: Add clarification about git workflow #13534

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c00db8a
Docs: Add clarification about git workflow
gziolo Jan 28, 2019
72d1f56
Update git-workflow.md
gziolo Jan 29, 2019
8186d10
Update git-workflow.md
gziolo Jan 29, 2019
e0b5539
Reword paragraph on merging vs. rebasing
mcsf Jan 29, 2019
4e2996b
Add references
ajitbohra Jan 29, 2019
7a92234
Add fork section
ajitbohra Jan 29, 2019
829c578
Clarify link to section "Perform a rebase"
mcsf Jan 30, 2019
56c3c42
Apply suggestions from code review
ntwb Jan 31, 2019
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
Prev Previous commit
Next Next commit
Update git-workflow.md
  • Loading branch information
@gziolo
gziolo authored Jan 29, 2019
commit 8186d103457890ab048703f4711fd9faba32424f
2 changes: 1 addition & 1 deletion docs/contributors/git-workflow.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ While it is tempting to merge from `master` into your branch frequently, this le

If you have a Pull Request branch that cannot be merged into `master` due to a conflict (this can happen for long-running Pull Request discussions), it's still best to rebase the branch (rather than merge) and resolve any conflicts on your local copy.

Once you have resolved any conflicts locally you can update the Pull Request with `git push --force-with-lease`.
Once you have resolved any conflicts locally you can update the Pull Request with `git push --force-with-lease`. Using `--force-with-lease` parameter is important to guarantee that you don't accidentally overwrite someone else's work.

To sum it up, you need to fetch any new changes in the repository, rebase your branch on top of `master`, and push the result back to the repository. These are the corresponding commands:

Expand Down