为什么有些提交不合并？

Question

我的工作流程是我的工作流程：

A'Master'Branch.
'devel'分支机构，我在成熟的新版本时合并成主人。
• 几个小分支机构，例如“ Imprimerie”，“ Ordicomatic”，等。 通常，我对“有序”做出了承诺，然后合并为“ Devel”，然后加入“主人”。一切习惯性地效果很好，但是最近我意识到，分支“有序”的委托没有影响，尽管我已将它们合并为“ Devel”，然后将其交给“ Master”。 这是相关时期的树（我在“有序”之前放了一个“！”以标记不合并的提交）：

* |   096c3c6  (tag: v2.0.6) Merge branch 'devel' BrRoman 21/11/2024 11:47
|\ \  
| * \   a4c5530  Merge branch 'ordomatic' into devel BrRoman 21/11/2024 11:47
| |\ \  
|/ / /  
| * | 119eb64  Ordomatic: todo updated. BrRoman 20/11/2024 19:25
| * | 8c5c99c  Ordomatic: minor corr. BrRoman 20/11/2024 19:25
| * | 4dddc95  Ordomatic: Saint Nom de Marie: added "CM 21". BrRoman 20/11/2024 19:25
| * | a7798da  Ordomatic: ML of Saints of 3d week of September corrected. BrRoman 20/11/2024 19:23
| * | b408cb3  Ordomatic: 2/11 corrected. BrRoman 20/11/2024 19:21
| * | 870ea4c  Ordomatic: "psalmi hebdomadæ…" => "psalmi anni…". BrRoman 20/11/2024 19:19
| * | 369d1b8  Ordomatic: 'ordo_write.py' => 'views.py/write_tex()'. BrRoman 20/11/2024 19:16
| * | b205aa3  Ordomatic: generalities improved. BrRoman 20/11/2024 19:14
| * | c293203  Ordomatic: write_pdf() => write_tex(). BrRoman 20/11/2024 19:13
|/ /  
* |   652271e  (tag: v2.0.5) Merge branch 'devel' BrRoman 14/11/2024 16:31
|\ \  
| * \   6724382  Merge branch 'barcode' into devel BrRoman 14/11/2024 16:31
| |\ \  
| | * | 13948b8  Barcode: added qrcode and improved barcode. BrRoman 14/11/2024 16:26
| * | |   0f749fc  Merge branch 'ordomatic' into devel BrRoman 14/11/2024 16:30
| |\ \ \  
| | * | | 9c1768c  !Ordomatic: lectiones.py: formatting. BrRoman 14/11/2024 04:45
| | * | | 3f7fa78  !Ordomatic: lectiones.py: biblical refs refreshed. BrRoman 14/11/2024 04:37
| | * | | 797bacd  !Ordomatic: todo refreshed. BrRoman 07/11/2024 17:39
| | * | | 32af6c8  !Ordomatic: saint Thérèse d'Avila simplified. BrRoman 07/11/2024 17:39
| | * | | 6bdca85  !Ordomatic: transfiguration: force = 90 always. BrRoman 07/11/2024 17:12
| | * | | 04beefb  !Ordomatic: various.py: tabs => spaces. BrRoman 07/11/2024 17:03
| | * | | 264f9a4  !Ordomatic: commemorations at Lauds in Lent. BrRoman 07/11/2024 16:39
| | * | | 377f9ad  !Ordomatic: 2/11: readings corrected. BrRoman 06/11/2024 19:20
| | * | | 36f426f  !Ordomatic: 2/11: rm report jeûne. BrRoman 06/11/2024 19:18
| * | | |   822b58e  Merge branch 'imprimerie' into devel BrRoman 14/11/2024 16:29
| |\ \ \ \  
| | |_|/ /  
| |/| | |   
| | * | | fb39280  Imprimerie: devis: + forfait coupe papier. BrRoman 06/11/2024 19:16
| | * | | 36d43d7  Imprimerie: 'Prix remise' => 'Prix remisé'. BrRoman 06/11/2024 16:43
| * | | | 8a61741  Todo refreshed. BrRoman 14/11/2024 08:31
| * | | | bd2f7e0  Home: 'infos' removed. BrRoman 06/11/2024 19:02
* | | | |   a4a7fa3  (tag: v2.0.4) Merge branch 'devel' BrRoman 05/11/2024 12:43
|\ \ \ \ \  
| |/ / / /  
| * | | |   2141429  Merge branch 'imprimerie' into devel BrRoman 05/11/2024 12:43
| |\ \ \ \  
| | |/ / /  
| | * | | 1d803f7  Imprimerie: form.py updated. BrRoman 05/11/2024 12:43
| | * | | 0f5e40b  Imprimerie: paper: + sheets_by_pack. BrRoman 05/11/2024 12:43
* | | | |   6648c32  (tag: v2.0.3) Merge branch 'devel' BrRoman 05/11/2024 12:29
|\ \ \ \ \  
| |/ / / /  
| * | | |   3d56e92  Merge branch 'imprimerie' into devel BrRoman 05/11/2024 12:29
| |\ \ \ \  
| | |/ / /  
| | | / /   
| | |/ /    
| |/| |     
| | * | 68f23a7  Imprimerie: paper: + price_full. BrRoman 05/11/2024 12:27
| |/ /  
| * |   431c868  Merge branch 'livrets' into devel BrRoman 05/11/2024 07:37
| |\ \  
| | * | 9245a36  Livrets: no Tierce 2 November. BrRoman 27/10/2024 19:10
| * | |   7443a4b  Merge branch 'ordomatic' into devel BrRoman 05/11/2024 07:37
| |\ \ \  
| | * | | 4df0e05  Ordomatic: proper parts for 2025 (defunts, semailles…). BrRoman 05/11/2024 07:24
| | * | | 12aa272  Ordomatic: write tex file: + 'encoding=utf-8'. BrRoman 05/11/2024 07:23
| | * | | dcfd527  Ordomatic: even_year calculation simplified. BrRoman 05/11/2024 07:22
| | * | | 6847f74  Ordomatic: Christmas and Holy Family: psalms. BrRoman 05/11/2024 07:21
| | * | | b7e43ca  Ordomatic: rm space above 'Sacrum Triduum Paschale'. BrRoman 05/11/2024 07:20
| | * | | f3f5e8d  Ordomatic: saint Charles 4/11: rm ant. Benedictus. BrRoman 05/11/2024 04:50
| | * | | 8dba818  Ordomatic: 2/11: if sunday: rm vigiles, gloria Patri, complies. BrRoman 05/11/2024 04:48
| | * | | f714389  Ordomatic: hebdo_psalt_inv. BrRoman 05/11/2024 04:42
| | * | | 13d9528  Ordomatic: psalmi ad Vigilias in sol. et festis. BrRoman 02/11/2024 18:40
| | * | | cd41730  Ordomatic: some spaces corrected. BrRoman 31/10/2024 19:18
| | * | | d98e3b8  Ordomatic: spaces removed before [:;!?]. BrRoman 31/10/2024 17:04

我确切地说，我只在没有贡献者的情况下工作，然后将所有内容都推到github（

https：//github.com/brroman/abbaye，您可以看到完整的树）只是作为备份副本。

为什么这些承诺不合并？我现在该怎么办才能合并它们？

-

我尝试的是：通过“ Devel”将分支“有序”合并到“主”中。 我期望的是：我的承诺会生效“主人”。

在签出

822b58e

并合并到其中时，请在本地尝试您的回购，其中一些合并冲突出现：

Answer 1

这些冲突很可能导致有关开发人员弄乱并意外地创建一个空的合并提交，从而丢弃了

$ git clone [email protected]:BrRoman/abbaye.git
$ cd abbaye
$ git switch --create ordo-test 9c1768c
$ git switch --create devel-test 822b58e
$ git merge ordo-test
Auto-merging TODO.md
CONFLICT (content): Merge conflict in TODO.md
Recorded preimage for 'TODO.md'
Automatic merge failed; fix conflicts and then commit the result.

分支的所有更改。