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.

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

VIDCS-3291: Update contributing doc to Reflect New Develop Branch Workflow #39

Merged
merged 6 commits into from
Feb 4, 2025

Conversation

dwivedisachin
Copy link
Collaborator

@dwivedisachin dwivedisachin commented Jan 31, 2025

What is this PR doing?

Update contributing doc to Reflect New Develop Branch Workflow.
See new contributing doc and PR template

How should this be manually tested?

n/a

What are the relevant tickets?

Resolves VIDCS-3291

[ ] Resolves a Known Issue.
[ ] If yes, did you remove the item from the docs/KNOWN_ISSUES.md?
[ ] Resolves an item reported in Issues.
If yes, which issue? Issue Number?
[ ] If yes, did you close the item in Issues?

@github-actions github-actions bot changed the base branch from main to develop January 31, 2025 12:21
Copy link
Contributor

@cpettet cpettet left a comment

Choose a reason for hiding this comment

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

Looks good so far! Just have a few comments/questions. Let me know what you think!

docs/CONTRIBUTING.md Outdated Show resolved Hide resolved
docs/CONTRIBUTING.md Outdated Show resolved Hide resolved
@dwivedisachin dwivedisachin requested a review from cpettet January 31, 2025 16:36
docs/CONTRIBUTING.md Outdated Show resolved Hide resolved
@dwivedisachin dwivedisachin requested a review from cpettet January 31, 2025 17:11
cpettet
cpettet previously approved these changes Jan 31, 2025
Our *main* branch is the evergreen source of truth for the Vonage Video API Reference App for React. Internally, we use Jira for issue tracking. Issue and feature branches use the format DEVELOPERNAME/TICKETNUMBER-SHORTDESCRIPTION e.g. alicesmith/VIDCS-123-fix-broken-icon. If you'd like to contribute a pull request, please use a branch on your fork with a descriptive name.
Our *main* branch is the evergreen source of truth for the Vonage Video API Reference App for React. However, all new development should be done in the develop branch. Contributions should be made by branching off develop, and pull requests should be submitted against develop. Periodically, develop will be merged into main as a batch.

Internally, we use Jira for issue tracking. Issue and feature branches use the format DEVELOPERNAME/TICKETNUMBER-SHORTDESCRIPTION e.g. alicesmith/VIDCS-123-fix-broken-icon. If you'd like to contribute a pull request, please use a branch on your fork with a descriptive name e.g. alicesmith/vonage-video-react-app/tree/fix-broken-icon.
Copy link
Collaborator

Choose a reason for hiding this comment

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

Why have we added the repo name and tree to the example branch name? 🤔

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Hey Mike!! I is an example of a forked branch by an external user. For example https://github.com/mobilebiz/vonage-video-react-app/tree/double-byte-chat-input

Copy link
Collaborator

@maikthomas maikthomas Feb 3, 2025

Choose a reason for hiding this comment

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

mmm I think that's confusing, the branch name in this example is still just fix-broken-icon

If we're giving them branch naming instructions then lets be direct, what do we want the branch name to be?
The fork owners name name and the tree are just part of github's linking system and will be there anyway since we have said to use your own fork.

(Otherwise people are going to be adding their whole remote + tree to the branch name)

Copy link
Contributor

@cpettet cpettet left a comment

Choose a reason for hiding this comment

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

LGTM Great job! :shipit:

Copy link
Collaborator

@maikthomas maikthomas left a comment

Choose a reason for hiding this comment

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

LGTM! Thanks for the changes 🙏

@maikthomas maikthomas merged commit 14b8c07 into develop Feb 4, 2025
6 checks passed
@maikthomas maikthomas deleted the VIDCS-3291-update-contributing-doc branch February 4, 2025 09:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants