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

Fix typos and "Merging to main" section in CONTRIBUTING.md #768

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

Fix typos and "Merging to main" section in CONTRIBUTING.md #768

wants to merge 2 commits into from

Conversation

uday-rana
Copy link
Member

@uday-rana uday-rana commented Jan 9, 2025 •
edited
Loading

Fixes #767.

Fixed some typos. Also:

starchart/CONTRIBUTING.md

Lines 122 to 129 in bf23d1c

## Merging to main
For maintainers: when a PR is ready to merge to main,
- always Squash and Merge all PRs. This is so we do not loose the commit history in the PR it self. So if we ever need to debug a feature PR, we have a commit history to reference. This also servers to keep history on main clean.
![squash_and_merge](img/squash_and_merge.png)

This section says that squashing and merging pull requests helps prevent losing the commit history which is not true. I've streamlined the section to remove that part.

@uday-rana
docs: fix typos
824b6d9
@uday-rana
docs: fix merging to main explanation
50dcbcd 
we wouldn't lose the commit history even with a rebase or a merge commit
@uday-rana
Copy link
Member Author

uday-rana commented Jan 9, 2025 •
edited
Loading

It'd also be a good idea to enforce this through branch rulesets instead of relying on maintainers to merge correctly.

Edit: Looks like it is enforced.

@humphd
Copy link
Contributor

humphd commented Jan 13, 2025

Looks like we have another issue before we can fix this:

Package libasound2 is a virtual package provided by:
  liboss4-salsa-asound2 4.2-build2020-1ubuntu3
  libasound2t64 1.2.11-1build2 (= 1.2.11-1build2)

Package libicu70 is not available, but is referred to by another package.
This may mean that the package is missing, has been obsoleted, or
is only available from another source

E: Package 'libasound2' has no installation candidate
E: Package 'libicu70' has no installation candidate
E: Unable to locate package libffi7
E: Unable to locate package libx264-163
Failed to install browsers
Error: Installation process exited with code: 100

@uday-rana
Copy link
Member Author

uday-rana commented Jan 14, 2025 •
edited
Loading

Maybe I'm missing something but I ran these and couldn't reproduce the error (although 60 of the tests failed):

npm i
npm run docker
npm run setup:test
npx playwright install --with-deps
npm run test:e2e:run

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@humphd humphd humphd approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Typos
2 participants
@uday-rana @humphd