Pull Updates from Github
You can stay updated about the latest commits to Fire App Builder by watching and starring the project in Github. You can also periodically check the Release Notes in the documentation (Introduction > Release Notes).
When Amazon pushes out updates to Fire App Builder, you’ll want to pull these updates into your own repo. You can do this by adding a remote to your existing GitHub repo. To add the remote:
From the command line,
cdto your new
fire-app-builderdirectory and type the following:
git remote add amzn-fab https://github.com/amzn/fire-app-builder.git
This adds a remote called “amzn-fab” to your repo. (You can name the remote whatever you want.)
Pull from the Amazon remote, specifying the master branch:
git pull amzn-fab master
If there are no new changes to pull, the response is as follows:
From https://github.com/amzn/fire-app-builder * branch master -> FETCH_HEAD Already up-to-date.
If there are changes, you’ll see the changed files listed in the response. You will see merge conflicts for any files with the same name in the amazon/fire-app-builder that you’ve customized in your own repo. For example, with navigator.json.
Follow standard Git practices for resolving merge conflicts. See Resolving a merge conflict using the command line.
If changes in the original repository’s files conflict with changes you’ve made to your local copy, git will not automatically overwrite your local copies with the updates. Instead, git will show you merge conflicts for the affected files and remove the affected files from its tracking. You need to resolve the merge conflicts, add the files back into git tracking, and commit your update.
When you see merge conflicts, run
git statusto see a list of the problematic files. Open the files and look for the carrots (
<<<<<<) indicating areas of conflict. Manually edit the files to remove the carrots, selecting the changes you want to keep and deleting those you want to discard. Then add the file back into git tracking with
git add ..
When you’re finished resolving conflicts, build your app to make sure everything works. Then push the changes into your own GitHub repo.
Here are some good resources for working with git: