| progr. |
основа (A baseless merge is a merging of two arbitrary branches in version control without reference to a base version. – Слияние без основы – это слияние двух прозвольных ветвей кода в репозитарии системы контроля версий, которые не имеют основы (базовой ветви). Alex_Odeychuk); базовая версия (говоря о ветви кода в системе контроля версий | The branch containing the changes that you want to merge is called the source branch. The branch that you want to push the changes into is the target branch. The common ancestor, that is to say the changeset that indicates the version from which these branches are derived, is called the base version. oleg.vigodsky) |
