Skip to content

Implement automated conflict detection#49

Open
davideast wants to merge 1 commit intomainfrom
conflict-check-3146001922287784660
Open

Implement automated conflict detection#49
davideast wants to merge 1 commit intomainfrom
conflict-check-3146001922287784660

Conversation

@davideast
Copy link
Copy Markdown
Owner

Added a script scripts/conflict-check.ts and a GitHub Actions workflow to detect modifications to frozen core files and large files to prevent merge conflicts. Also updated PREVENT_CONFLICTS.md to mark the task as completed.


PR created automatically by Jules for task 3146001922287784660 started by @davideast

Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
@google-labs-jules
Copy link
Copy Markdown
Contributor

👋 Jules, reporting for duty! I'm here to lend a hand with this pull request.

When you start a review, I'll add a 👀 emoji to each comment to let you know I've read it. I'll focus on feedback directed at me and will do my best to stay out of conversations between you and other bots or reviewers to keep the noise down.

I'll push a commit with your requested changes shortly after. Please note there might be a delay between these steps, but rest assured I'm on the job!

For more direct control, you can switch me to Reactive Mode. When this mode is on, I will only act on comments where you specifically mention me with @jules. You can find this option in the Pull Request section of your global Jules UI settings. You can always switch back!

New to Jules? Learn more at jules.google/docs.


For security, I will only act on instructions from the user who triggered this task.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant