-
-
Notifications
You must be signed in to change notification settings - Fork 3.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
ci(): changelog action + merge directive #8346
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
READY
@asturur what if we disable the lint action for now? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ready
@@ -0,0 +1,2 @@ | |||
# https://stackoverflow.com/a/13264117/9068029 | |||
CHANGELOG.md merge=union |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a cool thing instructing git to do a merge union in case of conflicts
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
tested it in this PR when I ran update from master and indeed it fast forwarded and merged the file as expected
Just resolved conflicts. GitHub.Desktop.2022-10-19.12-06-22_Trim.mp4 |
Build Stats
*inaccurate, see link |
Why i don't see action starting here? |
The changelog action is failing due to an unknown reason on #8135 , see failing job and CHANGELOG
This PR removes the action and adds a simple diff command to check if the file has changed instead of the action
In addition added
.gitattribute
instructing git to do a merge union in case of conflicts in CHANGLOG.