This repository has been archived by the owner on Jul 22, 2024. It is now read-only.
add command for updating third_party
#893
Merged
Conversation
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
compilation errors are thrown if the developer's checkout of the third-party repo (in their `third_party` directory) is not up to date. this command fixes that.
cvan
added
enhancement
bluemarvin
reviewed
Dec 14, 2018
README.md
Outdated
| The [repo in `third_party`](https://github.com/MozillaReality/FirefoxReality-android-third-party) can be updated like so: | ||
|
|
||
| ```bash | ||
| pushd third_party && git checkout master && git pull && popd |
There was a problem hiding this comment.
pushd third_party && git fetch && git rebase origin/master && popd
Is how I would do it.
There was a problem hiding this comment.
I like your suggestion better. changed.
I use git pull which does git pull --rebase because I have rebase = true in my ~/.gitconfig:
[branch "master"]
remote = origin
merge = refs/heads/master
rebase = truenotice the `git checkout origin/master` in case `third_party` was checked out to a different branch/sha
|
While we don’t currently have multiple branches, if someone does have a branch checked out, they would need to check out the master branch first. I think this is fine though. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
compilation errors are thrown if the developer's checkout of the third-party repo (in their
third_partydirectory) is not up to date. this command fixes that.