The repository for the Barbell project, Group 3.
There will be merge conflicts, so do check out the resources here of how to resolve them:
Whenever you want to sync with the main branch, get the latest main branch and then merge it with your branch. This will help you to avoid merge conflicts. There is some funny tools can help you with this as well.
# in your local branch, even if your changes doens't affect the main
# we would still do this to not stash changes
git add .
git commit -m "messages"
git push
# after clean the status of your local, now check out the main branch
git checkout main
git fetch && git pull
# now go back to your branch and merge the main branch
git checkout your-branch
# at this point you have two options
# 1. merge the main branch with your branch
git merge --no-ff main
# 2. rebase the main branch with your branch
git rebase main
That's it! You are now up to date with the main branch. Now submit and write that sweet PR.
Use present tense in your commit messages. For example, use "✨feature: Add xyz to component qrs" instead of "✨feature: Added xyz to component qrs". (Source)
Use the emojis below to distinguish what type of change you have made in your commit. This will help keep commit messages consistent and easier to read. For example, "📚docs: Update commit conventions in README.md".
For effective project management and prioritization, our GitHub issue boards utilize the following fields:
Indicates the overall scope and effort required for a task, measured in:
Tasks are assigned to team members by their first name. For tasks with multiple assignees, names are comma-separated.
In case you encountered, Failed to get localhost. Please point to your production server.
TBA
<!-- sync development build with [yap] -->
eas update --auto
<!-- build android aab (apk successor) -->
eas build --platform android