Pro Git ⬇ PDF
Pro Git · Eduspaces ·
https://eduspaces.ro/s/pro-git/termen/c-merge/?pdf=1
Conținut/ Git Branching/ Branching/ Merge
🌿 Git Branching proces nivel 1 · bază

Merge

Alte forme: merged, merges, merging

Unul dintre cele două moduri principale de integrare a modificărilor dintr-o ramură în alta (celălalt este rebase): ia capetele ramurilor și le combină, fie prin fast-forward, fie printr-o fuziune cu trei căi.

📖 Prima definiție în carte p. 277 · 7.8 Advanced Merging
Merging in Git is typically fairly easy.
Citește în context →
Secțiuni dedicate: 8.2.4 Merge Strategies
Alte locuri unde e explicat (1)
  • p. 360 — Merge made by recursive.
Termeni legați, după nivel:

Ilustrații din manual (32)

Figure 116. Merge button and instructions for merging a Pull Request manually Figure 116 · p. 202Merge button and instructions for merging a Pull Request manually Figure 159. History after re-merging a reverted merge Figure 159 · p. 291History after re-merging a reverted merge Figure 24. Three snapshots used in a typical merge Figure 24 · p. 82Three snapshots used in a typical merge Figure 96. Pull Request does not merge cleanly Figure 96 · p. 187Pull Request does not merge cleanly Figure 97. Pull Request now merges cleanly Figure 97 · p. 188Pull Request now merges cleanly Figure 29. History after merging dumbidea and iss91v2 Figure 29 · p. 91History after merging dumbidea and iss91v2 Figure 36. Merging to integrate diverged work history Figure 36 · p. 102Merging to integrate diverged work history Figure 45. Fetch more commits, and merge them into your work Figure 45 · p. 107Fetch more commits, and merge them into your work

Structura

Concepte care se referă la Merge

Sub acest termen

Fast-forwardgit mergeMerge conflictThree-way merge

În carte

pag. 79 · 3.2.1pag. 81 · 3.2.2pag. 101 · 3.6.1

Apare la paginile: 3, 4, 5, 40, 41, 49, 50, 52, 58, 59, 60, 63, 66, 69, 74, 75, 76, 79, 81, 82, 83, 84, 85, 86, 88, 89, 90, 91, 98, 99, 100, 101, 102, 103, 104, 106, 107, 108, 109, 110, 130, 132, 133, 134, 135, 137, 138, 139, 140, 141, 142, 143, 146, 147, 148, 149, 150, 152, 153, 156, 157, 159, 160, 161, 162, 163, 164, 165, 166, 168, 170, 178, 181, 182, 185, 186, 187, 188, 191, 196, 200, 201, 202, 204, 205, 221, 223, 224, 225, 226, 227, 228, 229, 230, 240, 244, 245, 251, 253, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 298, 299, 300, 301, 304, 309, 313, 314, 315, 316, 317, 318, 319, 320, 321, 346, 347, 348, 349, 352, 360, 362, 373, 377, 378, 379, 380, 381, 383, 386, 387, 388, 389, 390, 397, 398, 402, 403, 405, 419, 455, 464, 465, 466, 467, 488, 489, 490, 491, 492, 494, 495, 498, 499, 500, 501.

Definiția este o reformulare scurtă verificată față de paginile indicate; nu este o validare științifică independentă.