forked from facebook/create-react-app
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
eeab0e5
commit f72cee8
Showing
2 changed files
with
28 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
# Maintaining CRA fork guide | ||
|
||
Lighter is fork of [Create React App](https://github.com/facebook/create-react-app) (CRA). To benefit from CRA updates and patches, please follow this guide to synchronize repositories. | ||
|
||
## Guide | ||
|
||
1. `git checkout upstream` `upstream` branch hosts CRA `master` branch | ||
2. `git fetch upstream` will download upstream changes from CRA | ||
3. `git merge upstream/master` will merge CRA `master` to `upstream` | ||
4. `git checkout -b 'feat/cra-update'` | ||
6. `git rebase upstream` rebase `upstream` on `feat/cra-update` | ||
7. Resolve conflicts and continue rebase `git rebase --continue` | ||
8. `git push --set-upstream origin feat/cra-update` push rebased code to remote | ||
9. Open Pull request on Github to `master` | ||
10. merge |