[No QA] Remove --depth=1 to fix rebase#61120
Merged
Merged
Conversation
Contributor
Author
|
@akinwale no C+ review needed here |
AndrewGable
approved these changes
Apr 30, 2025
Contributor
Reviewer Checklist
Screenshots/VideosAndroid: NativeAndroid: mWeb ChromeiOS: NativeiOS: mWeb SafariMacOS: Chrome / SafariMacOS: Desktop |
|
@AndrewGable looks like this was merged without a test passing. Please add a note explaining why this was done and remove the |
Contributor
|
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
Contributor
|
No emergency, just a failed remote build |
61 tasks
Contributor
|
🚀 Deployed to staging by https://github.com/AndrewGable in version: 9.1.39-0 🚀
|
Contributor
|
🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.1.39-8 🚀
|
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Explanation of Change
Rebase isn't working because we aren't fetching everything that was added on the remote. Lacking the proper history, git can't resolve conflicts during the rebase (because commits being replayed do not have a common merge-base).
Fixed Issues
$ #59856
Tests
I was able to reproduce the bug easily in the test fork, and here is a workflow run showing the fix.
I was pleasantly surprised to see that the fetch was still fast. The repo was shallow-checked out, so by default
fetchwill get all the new commits, and to get older commits you'd need to pass flags like--deepenor--depth=Xor--shallow-sinceor--shallow-exclude.Offline tests
None.
QA Steps
None.
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectiontoggleReportand notonIconClick)src/languages/*files and using the translation methodSTYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel and/or tagged@Expensify/designso the design team can review the changes.ScrollViewcomponent to make it scrollable when more elements are added to the page.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
MacOS: Desktop