Synchronize your project with EXAMPLE
Quick steps (do it when you've already done it before)
- Sync changes from BACA
git fetch --all
git branch -D sync/example-slider
git checkout -b sync/example-slider
git merge baca/feat/slider
git push --set-upstream origin sync/example-slider --force
- Merge branches
git checkout main
git merge origin/sync/baca
This template have couple of great examples that you can find here
warning
You need to have git history from BACA, to make this working.
Step 1. Add baca git remote
git remote add baca git@github.com:binarapps/baca-react-native-template.git
Step 2. Fetch changes from all remotes
This will fetch baca remote
git fetch --all
Step 3. Find example that you want to add
List of examples can be found here
Step 4. Get branch name of example
For example feat/slider
Step 5. Sync changes
git branch -D sync/example-slider
git checkout -b sync/example-slider
git merge baca/feat/slider
# resolve conflicts if needed
git push --set-upstream origin sync/example-slider --force
Step 6. Merge branches
You have two ways to do that:
- Create pull request
- Merge branch locally:
git checkout main
git merge origin/sync/baca