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

Jump to bottom

docs(contrib): add notes on handling merge conflicts during backports #13634

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

docs(contrib): add notes on handling merge conflicts during backports #13634

wants to merge 4 commits into from

Commits on Sep 20, 2024

  1. docs(contrib): add notes on dealing with merge conflicts 

    - split out a "Merge Conflicts" section for this
  - fix up some formatting in the existing sentence to match the docs style guide
  - add what to do if you're not sure how to fix it: don't backport it is the safer option
  - add instruction to add a note in the commit if you did fix a merge conflict
    - add prior examples of this as well

- remove `chore(deps)`, `build`, and `ci` from the "list of commits"
  - matching the "Ignore: " below from argoproj@7e69527
  - these also tend to cause the most merge conflicts, directly or indirectly

- add note about pinning release announcements in Slack
  - use the specific terms that the Slack UI uses: "Pin" and "Un-pin"

Signed-off-by: Anton Gilgur <[email protected]>
    @agilgur5
    agilgur5 committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    0083bb6 View commit details
    Browse the repository at this point in the history

  2. fix .spelling 

    Signed-off-by: Anton Gilgur <[email protected]>
    @agilgur5
    agilgur5 committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    514c5ce View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2024

  1. style guide: simplify, avoid 'just' 

    Signed-off-by: Anton Gilgur <[email protected]>
    @agilgur5
    agilgur5 committed Sep 21, 2024
    Configuration menu
    Copy the full SHA
    4b9b806 View commit details
    Browse the repository at this point in the history

  2. add a note on backporting older commits to resolve merge conflicts as… 

    … well

Signed-off-by: Anton Gilgur <[email protected]>
    @agilgur5
    agilgur5 committed Sep 21, 2024
    Configuration menu
    Copy the full SHA
    6e172a0 View commit details
    Browse the repository at this point in the history