3.32.0
git clone https://github.com/UCSD/campus-mobile.gitYou'll want to make sure you keep your repo up to date by tracking the original "upstream" repo that you cloned. To do this, you'll need to add a remote:
# Add 'upstream' repo to list of remotes
git remote add upstream https://github.com/UCSD/campus-mobile.gitWhenever you want to update your repo with the latest upstream changes, you'll need to first fetch the upstream Campus Mobile repo's branches and latest commits to bring them into your repository:
# Fetch from upstream remote
git fetch upstreamNow you are ready to checkout your local experimental branch and merge in any changes from the upstream repo's experimental branch:
# Checkout your master branch and merge upstream
git checkout experimental
git merge upstream/experimentalYour local experimental branch is now up-to-date with any changes upstream.
# Add 'upstream' repo to list of remotes
git remote add upstream https://github.com/UCSD/campus-mobile.git# Fetch from upstream remote
git fetch upstreamWhen you begin working on a new feature or bugfix, it is important that you create a new branch. Not only is it proper git workflow, but it also keeps your changes organized and separated from the experimental branch so that you can easily submit and manage multiple pull requests for every task you complete.
To create a new branch and start working on it:
# Checkout the experimental branch
git checkout experimental
# Create and checkout a branch named newfeature
git checkout -b experimentalYou are now ready to begin developing your new feature. Commit your code often, using present-tense and concise verbiage explaining the work completed.
Example: Add, commit, and push your new feature:
# Show the state of staged and unstaged files you created or updated
git status
# Add files to include in your newfeature
git add lib/core/push_notifications_in_app.dart
# Commit your code
git commit -m "Add in-app push notifications"
# Push your code
git push -u upstream newfeature
From the time you created your new feature branch newfeature, to submitting a pull request, it is likely that your branch
Branch upstream/experimental is updated often. Prior to submitting a pull request, update your newfeature branch from upstream/experimental so that merging it will be a simple process which won't require any conflict resolution work.
# Fetch upstream experimental and merge with your local experimental branch
git fetch upstream
git checkout experimental
git merge upstream/experimental
# If there were any new commits, merge them to your `newfeature` branch from the `experimental` branch
git checkout newfeature
git merge experimental
git push upstream newfeatureOnce you've committed and pushed your feature branch newfeature to GitHub, navigate to to your new feature branch on UCSD's Campus Mobile GitHub and click the 'New pull request' button.
If you need to make future updates to your pull request, push the new commit or commits to your feature branch newfeature on GitHub. Your pull request will automatically track the changes on your feature branch and generate new builds for iOS and Android.
The goal of this platform is to provide responsive and intuitive mobile interactions for a personalized campus experience.
UC San Diego uses this platform for its campus mobile app on iOS and Android.
MIT