Merged
Conversation
Contributor
Author
|
I see conflicts with unrelated submodules that I haven't touched, unsure what I did wrong here. Is it because I'm using an old branch? I can create a new branch just for this update if needed. |
Collaborator
|
@FrostSource, yes, your branch is behind it seems and doesn't include changes to many addons. Please update your branch |
Contributor
Author
|
Let me know if I didn't resolve this correctly. Thanks for your patience. |
carsakiller
force-pushed
the
update-HLA-VScript
branch
from
b85b684 to
7727c54
Compare
Collaborator
|
Just corrected it 🙂. Submodules are a bit confusing, even to me after all this time, but I just reset your branch and moved your submodule to the latest commit on main. |
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
2 participants
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.
Updates the submodule to the latest commit.