Путеводитель по Руководству Linux
User
|
Syst
|
Libr
|
Device
|
Files
|
Other
|
Admin
|
Head
|
Пользовательские команды
git-merge
( 1 )
объедините две или более историй развития вместе (
Join two or more development histories together
)
Name
|
Synopsis
|
Description
|
Options
|
Pre-merge checks
|
Fast-forward merge
|
True merge
|
Merging tag
|
How conflicts are presented
|
How to resolve conflicts
|
Examples
|
Merge strategies
|
Configuration
|
See also
|
Имя (
Name
)
git-merge - Join two or more development histories together
Исходный текст на man7.org
