small-hack/argocd-apps
small-hack/argocd-apps
3
1
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

revert default tracking method to label #2

Open
cloudymax wants to merge 1 commit from tracking-method into main
pull from: tracking-method
merge into: small-hack:main
Conversation 0 Commits 1 Files changed 1 +1 -1
cloudymax commented 2026-01-28 20:57:39 +00:00
Owner
Copy link

see: https://github.com/argoproj/argo-cd/issues/23687

see: https://github.com/argoproj/argo-cd/issues/23687
This pull request has changes conflicting with the target branch.
  • argocd/app_of_apps/argocd_argocd_appset.yaml
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin tracking-method:tracking-method
git switch tracking-method

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff tracking-method
git switch tracking-method
git rebase main
git switch main
git merge --ff-only tracking-method
git switch tracking-method
git rebase main
git switch main
git merge --no-ff tracking-method
git switch main
git merge --squash tracking-method
git switch main
git merge --ff-only tracking-method
git switch main
git merge tracking-method
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
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
small-hack/argocd-apps!2
No description provided.