dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-06-19 09:24:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

feature: allow merging tags into branches (#671)

Browse source 
Adds "Merge {tag} into {branch}" menu item to tag menu in histories.
The rest is handled by already existing merge code.
This commit is contained in:
Dmitrij D. Czarkoff 2024-11-10 04:51:15 +00:00 • committed by GitHub
parent b974436c8a
commit 4924e960bf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 23 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/Resources/Locales/zh_CN.axaml
View file

@ -636,6 +636,7 @@
<x:String x:Key="Text.TagCM.Copy" xml:space="preserve">复制标签名</x:String>
<x:String x:Key="Text.TagCM.CopyMessage" xml:space="preserve">复制标签信息</x:String>
<x:String x:Key="Text.TagCM.Delete" xml:space="preserve">删除 ${0}$...</x:String>
<x:String x:Key="Text.TagCM.Merge" xml:space="preserve">合并 ${0}$ 到 ${1}$...</x:String>
<x:String x:Key="Text.TagCM.Push" xml:space="preserve">推送 ${0}$...</x:String>
<x:String x:Key="Text.URL" xml:space="preserve">仓库地址 ：</x:String>
<x:String x:Key="Text.UpdateSubmodules" xml:space="preserve">更新子模块</x:String>