Maniphest T7748

Check and fix conflict check workflow
Closed, ResolvedPublic
Actions

Assigned To

Authored By

	Vijayakumar
	Aug 23 2025, 7:52 AM

Tags

Referenced Files

None

Subscribers

Global Notifications

Description

https://github.com/VyOS-Networks/vyos-1x/pull/1011 this PR reports that all conflicts have been resolved but there are clear conflicts shown by GitHub in the end of the PR. Can you please check?

Details

Version: -
Is it a breaking change?: Unspecified (possibly destroys the router)
Issue type: Unspecified (please specify)

Related Objects
Search...

		Status	Subtype	Assigned	Task
		Resolved		Vijayakumar	T6707 Implement a new build and release workflow based on GitHub Actions
		Resolved		Vijayakumar	T7748 Check and fix conflict check workflow

Event Timeline

Vijayakumar created this task.Aug 23 2025, 7:52 AM

Vijayakumar triaged this task as High priority.

Vijayakumar created this object in space S1 VyOS Public.

Vijayakumar mentioned this in rVYOSONEX564cc64ef618: T7748: conflict check workflow updated to marketplace action with increased….Aug 27 2025, 4:30 PM

Restricted Repository Identity mentioned this in rVYOSONEXadb3e06fc90e: Merge pull request #4681 from kumvijaya/current.Aug 27 2025, 4:30 PM

Vijayakumar mentioned this in rVYOSONEXb10133f5bdc6: T7748: using mergify rule to handle conflict checks for private repo.Sep 25 2025, 11:25 AM

Vijayakumar mentioned this in rVYOSONEX1c02b74d680d: T7748: using mergify rule to handle conflict checks for private repo.

Restricted Repository Identity mentioned this in rVYOSONEXd786c09cee03: Merge pull request #4751 from kumvijaya/current.Sep 25 2025, 11:25 AM

Vijayakumar closed this task as Resolved.Sep 27 2025, 6:07 PM