aboutsummaryrefslogtreecommitdiffstats
path: root/templates/repo/code/upstream_diverging_info.tmpl
Commit message (Collapse)AuthorAgeFilesLines
* Improve sync fork behavior (#33319)wxiaoguang2025-01-201-6/+8
| | | | | | | | Fix #33271 Suppose there is a `branch-a` in fork repo: 1. if `branch-a` exists in base repo: try to sync `base:branch-a` to `fork:branch-a` 2. if `branch-a` doesn't exist in base repo: try to sync `base:main` to `fork:branch-a`
* Fix push message behavior (#33215)Chai-Shi2025-01-171-3/+3
| | | | | | | Fixes #32769 by the logic from pr #33192 --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
* Add a confirm dialog for "sync fork" (#33270)wxiaoguang2025-01-141-1/+4
| | | Try to quickly fix #33264
* Fix sync fork for consistency (#33147)Chai-Shi2025-01-101-3/+3
| | | | | | | | | Fixes #33145 An integration test could be added. --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
* Use primary as button color (#32949)wxiaoguang2024-12-221-1/+1
| | | | * Fix #32871 * Fix #32948
* Support "merge upstream branch" (Sync fork) (#32741)wxiaoguang2024-12-061-0/+18
Add basic "sync fork" support (GitHub-like) <details> ![image](https://github.com/user-attachments/assets/e71473f4-4518-48c7-b9e2-fedfcd564fc3) </details>
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-21 23:10:17 +0000