Update branch with latest changes #1016
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
rafaellehmkuhl
requested changes
Jun 19, 2024
ArturoManzoli
force-pushed
the
interface-rework
branch
5 times, most recently
from
ebb8473 to
026f6b6
Compare
rafaellehmkuhl
requested changes
Jun 20, 2024
There was a problem hiding this comment.
Arturo, it looks like it's still adding unknown commits to the middle of the branch.
Those highlighted commits are in the master branch, but they do not have the same hash. Maybe you're taking those commits from your local branch, instead of the upstream master?
This PR:
Upstream master:
ArturoManzoli
force-pushed
the
interface-rework
branch
from
026f6b6 to
4c8fb94
Compare
|
If you are having problems with rebase, try to cherry-pick a range of commits |
ArturoManzoli
force-pushed
the
interface-rework
branch
2 times, most recently
from
50b32a5 to
387b5ca
Compare
rafaellehmkuhl
force-pushed
the
interface-rework
branch
from
6ac3058 to
e0e5cbb
Compare
rafaellehmkuhl
merged commit 387b5ca
into
bluerobotics:interface-rework
8 checks passed
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.
Updates prior to merging the Interface changes on PR #1002