Merge to main preparation#18
Open
scottwcpg wants to merge 4 commits intozephyrproject-rtos:masterfrom
Open
Conversation
Rename the SoC series option to MEC15XX to align with the new hwmv2 config name, drop the 1701x option which had no references anyway. Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com>
The hal_microchip repo is still using "master" as the default branch name. We want to switch the default branch to "main" for future development. Signed-off-by: Scott Worley <scott.worley@microchip.com>
Collaborator
|
@nashif @carlescufi who has permission access to change the default branch from master to main? |
Member
|
What is missing to get this change? |
Member
|
Hi @scottwcpg . You need to remove the merge commits. |
Collaborator
Author
Hi nandojve. I do not know how to do remove the merge commits without destroying or corrupting it. I read git documents it does no good. I wanted a MCHP developer with extensive git experience to be the maintainer of this repo. Can't always get what you want ;<) |
Member
|
CC: @NhMchp |
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
4 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.
Merge in the commits made to "master" branch that were not in "main" so we can switch the default branch to main please.