Docs: Add clarification about git workflow #13534
Conversation
|
I’m OOO today but did a quick scan and it looks great to me. Admittedly I’m a merge from master guy (I like having the history of where I merged) but I think rebasing is more commonly preferred and it’s reasonable to encourage that! |
|
@gziolo i am that With all sugegstions so far looks good 👍 as mentioned by @talldan it would be good to cover syncing fork https://help.github.com/articles/syncing-a-fork/ we can either adopt this or link it We can add some resources / links for further references:
|
|
@ajitbohra great idea about adding a section with references. Feel free to add your commit with the changes proposed. @mcsf - your changes looks great, many thanks for helping to make it more friendly for those who start digging into git world. |
Pro Git is such a great resource—at least the v1 was when I read it back in the day. 👌 Might be more useful to point to the online book rather than the repo, no? |
|
yes link to online book 💯 |
|
Added references and section to work with fork. |
Co-Authored-By: gziolo <grzegorz@gziolo.pl>
|
Nice teamwork, thanks everyone for feedback, commits and sharing great ideas. Is it good to merge as is? I can't accept my own PR, so I'm waiting for ✅ before I proceed further :) |
…rnmobile/372-use-RichText-on-Title-block * 'master' of https://github.com/WordPress/gutenberg: Try alternate list item jump fix. (#12941) Mobile bottom sheet component (#13612) Remove unintentional right-margin on last odd-item. (#12199) Introduce left and right float alignment options to latest posts block (#8814) Fix Google Docs table paste (#13543) Increase bottom padding on gallery image caption (#13623) Fix the editor save keyboard shortcut not working in code editor view (#13159) Plugin: Deprecate gutenberg_add_admin_body_class (#13572) Rnmobile/upload media failed state (#13615) Make clickOnMoreMenuItem not dependent on aria labels (#13166) Add: className prop support to server side render. (#13568) Fix: Categories Block: hierarchical Dropdown (#13567) Docs: Add clarification about git workflow (#13534) Plugin: Remove `user_can_richedit` filtering (#13608) eslint-plugin: Add rule `no-unused-vars-before-return` (#12828) Image settings button (#13597) Fixed wording for the color picker saturation (#13479) # Conflicts: # packages/block-library/src/image/edit.native.js
* Docs: Add clarification about git workflow * Update git-workflow.md * Update git-workflow.md * Reword paragraph on merging vs. rebasing * Add references * Add fork section * Clarify link to section "Perform a rebase" * Apply suggestions from code review Co-Authored-By: gziolo <grzegorz@gziolo.pl>
* Docs: Add clarification about git workflow * Update git-workflow.md * Update git-workflow.md * Reword paragraph on merging vs. rebasing * Add references * Add fork section * Clarify link to section "Perform a rebase" * Apply suggestions from code review Co-Authored-By: gziolo <grzegorz@gziolo.pl>
Description
In #12747 (comment) @kadencethemes asked about clarification what does rebasing PRs mean:
This PR adds new section to docs which tries to explain it. It might be not perfect so I would appreciate your feedback to make it even simpler to understand.
I also updated Repository Management page to include the step about keeping branches up to date with master branch.