Skip to content

Commit 8d613dd

Browse files
authored
chore: more instructions on repository syncing (#173)
1 parent d449be9 commit 8d613dd

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

README.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,15 @@ git tag --merged <branch>
7474
git merge chromedevtools/chromium/5845
7575
```
7676

77-
3. Submit and merge your PR.
78-
4. Tag the merge commit! This marks the point at which we synced the repo with the upstream branch.
79-
77+
3. Validate your changes by running a smoke test.
78+
You can use the one defined in the [summary of this pull request](https://github.com/facebook/react-native-devtools-frontend/pull/172), please also enhance it with more test cases and add all them to the summary of your PR.
79+
4. Before merging your PR, go to [repository settings](https://github.com/facebook/react-native-devtools-frontend/settings) and make sure "Allow merge commits" is enabled.
80+
5. Merge your commit. It is important to merge and not to squash, otherwise our fork would diverge from Google's upstream significantly.
81+
6. Go to [repository settings](https://github.com/facebook/react-native-devtools-frontend/settings) and disable "Allow merge commits" setting. All changes that are not related to fork syncing should be squashed in a single commit.
82+
7. Tag the merge commit! This marks the point at which we synced the repo with the upstream branch.
8083
```sh
8184
git tag sync-chromium-5845
85+
git push origin sync-chromium-5845
8286
```
8387
8488
## Contributing

0 commit comments

Comments
 (0)