wxiaoguang
39de2955fd
Improve sync fork behavior ( #33319 )
...
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`
2025-01-20 15:17:47 +08:00
Chai-Shi
55e0756c68
Fix push message behavior ( #33215 )
...
Fixes #32769 by the logic from pr #33192
---------
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
2025-01-17 19:37:17 +00:00
wxiaoguang
1299fdb084
Add a confirm dialog for "sync fork" ( #33270 )
...
Try to quickly fix #33264
2025-01-14 18:30:43 +00:00
Chai-Shi
e5f3c16587
Fix sync fork for consistency ( #33147 )
...
Fixes #33145
An integration test could be added.
---------
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
2025-01-10 05:29:55 +00:00
wxiaoguang
afe314fa77
Use primary as button color ( #32949 )
...
* Fix #32871
* Fix #32948
2024-12-22 23:03:39 +08:00
wxiaoguang
513da407f4
Support "merge upstream branch" (Sync fork) ( #32741 )
...
Add basic "sync fork" support (GitHub-like)
<details>
![image](https://github.com/user-attachments/assets/e71473f4-4518-48c7-b9e2-fedfcd564fc3 )
</details>
2024-12-06 21:10:35 +00:00