documentation/overview-manual/development-environment.rst

167       branch of ``poky`` and you are going to use ``meta-intel``, be
168       sure to checkout the "&DISTRO_NAME_NO_CAP;" branch of ``meta-intel``.
236 responsible for the integrity of the development branch of a given Git
237 repository. The development branch is the "upstream" repository from which
240 organizing the underlying branch structure to reflect release strategies
258 branches into the "master" branch of the Git repository.
268 with whatever upstream branch they are working against. They are also
276 maintainer include them into an upstream branch. This process is called
283 development branch of the Git repository, which is controlled by the
314    have merged it into your local development branch, simply discard the
315    temporary branch.
318    changes from one branch and fold them into another branch. This
327    example, you can have a "work" branch to develop in, a "test" branch
328    where the code or change is tested, a "stage" branch where changes
351    considered for the development branch of the Git repository. To send
418 the current "&DISTRO_NAME_NO_CAP;" branch, the "master" branch, and many
424 "master" branch represents the current or most recent development. All
425 other branches represent offshoots of the "master" branch.
429 local working area (also called a branch) that tracks a specific
430 development branch from the upstream source Git repository. In other
432 development branch in the repository. To help illustrate, consider the
441 local branch named "&DISTRO_NAME_NO_CAP;", which tracks the upstream
442 "origin/&DISTRO_NAME_NO_CAP;" branch. Changes you make while in this
443 branch would ultimately affect the upstream "&DISTRO_NAME_NO_CAP;" branch
447 working branch based on a branch name, your local environment matches
448 the "tip" of that particular development branch at the time you created
449 your local branch, which could be different from the files in the
450 "master" branch of the upstream repository. In other words, creating and
451 checking out a local branch based on the "&DISTRO_NAME_NO_CAP;" branch
452 name is not the same as checking out the "master" branch in the
456 Git uses "tags" to mark specific changes in a repository branch
469 create and checkout a local working Git branch based on a tag name. When
472 The most common use is to checkout a working branch that matches a
486 a branch named "my-rocko-18.0.0" that is based on the upstream branch
491 checkout a local working branch based on a tag, your environment matches
492 a specific point in time and not the entire development branch (i.e.
493 from the "tip" of the branch backwards).
534 -  *git checkout branch-name:* Changes your local working branch and
535    in this form assumes the local branch already exists. This command is
538 -  *git checkout -b working-branch upstream-branch:* Creates and
539    checks out a working branch on your local machine. The local branch
540    tracks the upstream branch. You can use your local branch to isolate
545 -  *git branch:* Displays the existing local branches associated
546    with your local repository. The branch that you have currently
549 -  *git branch -D branch-name:* Deletes an existing local branch.
550    You need to be in a local branch other than the one you are deleting
551    in order to delete branch-name.
557    branch). The ``--rebase`` option ensures that any local commits you
558    have in your branch are preserved at the top of your local branch.
560 -  *git push repo-name local-branch:upstream-branch:* Sends
564    changes (commits) into the appropriate branch of project's upstream
567 -  *git merge:* Combines or adds changes from one local branch of
568    your repository with another branch. When you create a local Git
569    repository, the default branch may be named "main". A typical
570    workflow is to create a temporary branch that is based off "main"
572    that isolated branch, stage and commit them locally, switch to the
573    "main" branch, and then use the ``git merge`` command to apply the
574    changes from your isolated branch into the currently checked out
575    branch (e.g. "main"). After the merge is complete and if you are
576    done with working in that isolated branch, you can safely delete the
577    isolated branch.
580    one branch into another branch. There are times when you might not be
581    able to merge all the changes in one branch with another but need to