verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 63 Releases Wiki Activity

Hotfix changes whit conficts merged incorrectly #2829

Merged
carlosap merged 1 commits from Hotfix-changes-whit-conficts-merged-incorrectly into master 2024-08-02 12:16:04 +00:00
Conversation 0 Commits 1 Files Changed 2 +20 -11
carlosap commented 2024-08-02 11:48:31 +00:00
Member
Copy Link
No description provided.
carlosap added 1 commit 2024-08-02 11:48:32 +00:00
gitea/salix/pipeline/pr-master This commit looks good Details
f431d6c37f Hotfix changes whit conficts merged incorrectly
carlosap requested review from guillermo 2024-08-02 11:48:44 +00:00
guillermo approved these changes 2024-08-02 12:15:41 +00:00
carlosap merged commit e1dc7a3cb9 into master 2024-08-02 12:16:04 +00:00
carlosap deleted branch Hotfix-changes-whit-conficts-merged-incorrectly 2024-08-02 12:16:05 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
guillermo
Labels
Clear labels   
CR / Tests passed

Unit tests and e2e passed

  
e2e

Implement e2e

  
Missing tests

Missing tests

  
Needs refactor

   
Simple

Simple check / No CR needed

No Label
CR / Tests passed
e2e
Missing tests
Needs refactor
Simple
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix#2829
No description provided.
Delete Branch "Hotfix-changes-whit-conficts-merged-incorrectly"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?