Sup-4597 - Deprecation of support_script_and_upload task [st0305] #175
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
Aaronoftheages
force-pushed
the
SUP-4597_Deprecate_ST0305_support_script_and_upload
branch
from
8b6470e
to
17b2cc2
Compare
m0dular
suggested changes
Nov 6, 2023
There was a problem hiding this comment.
52c0c9c is another merge of main into your feature branch. When a feature needs updating after main receives new commits, it should always be via git pull --rebase. Does this config setting not work for VS code or something?
git config --global pull.rebase true
You should be able to fix this branch with the command below again, but please ensure that updating feature branches is done with pull --rebase in the future.
git pull --rebase origin main -X theirs
1dea0b2
to
3b36ba9
Compare
|
can you rebase using the command @m0dular mentioned |
Aaronoftheages
force-pushed
the
SUP-4597_Deprecate_ST0305_support_script_and_upload
branch
2 times, most recently
from
6fa2572
to
398ed40
Compare
MartyEwings
requested changes
Nov 7, 2023
|
Seeing validation errors, running |
Aaronoftheages
force-pushed
the
SUP-4597_Deprecate_ST0305_support_script_and_upload
branch
2 times, most recently
from
7a1722c
to
5d28605
Compare
MartyEwings
requested changes
Nov 7, 2023
Aaronoftheages
force-pushed
the
SUP-4597_Deprecate_ST0305_support_script_and_upload
branch
from
6ca59dd
to
9338e6b
Compare
Aaronoftheages
force-pushed
the
SUP-4597_Deprecate_ST0305_support_script_and_upload
branch
from
78298f5
to
59d0ae9
Compare
m0dular
approved these changes
Nov 7, 2023
|
I think @MartyEwings also needs to approve to satisfy the branch protection rules? |
MartyEwings
approved these changes
Nov 7, 2023
Aaronoftheages
deleted the
SUP-4597_Deprecate_ST0305_support_script_and_upload
branch
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.
The deprecation of task 305 with deprecation message added during runtime.