Synchronize your project with BACA
Quick steps (do it when you've already done it before)
- Sync changes from BACA
git fetch --all
git branch -D sync/baca
git checkout -b sync/baca
git merge baca/main
git push --set-upstream origin sync/baca --force
- Merge branches
git checkout main
git merge origin/sync/baca
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. Sync changes
git branch -D sync/baca
git checkout -b sync/baca
git merge baca/main
# resolve conflicts if needed
git push --set-upstream origin sync/baca
Step 4. Merge branches
You have two ways to do that:
- Create pull request
- Merge branch locally
git checkout main
git merge origin/sync/baca