cg-merge(1)

NAME

cg-merge - merge a branch to the current branch

SYNOPSIS

cg-merge [-n] [-b BASE_COMMIT] [-j] [--squash] [-v]

[BRANCH_NAME].sp

DESCRIPTION

Arrayin the given branch to your current branch. This can produce a
merging commit on your branch sticking the two branch together
(so-called tree merge). However in case there are no changes in your branch that wouldn't be in the remote branch, no merge commit is done and commit pointer of your branch is just updated to
the last commit on the remote branch (so-called fast-forward merge)..sp In case of conflicts being generated by the merge, you
have to examine the tree (cg-merge will tell you which files contain commits; the commits are denoted by rcsmerge-like markers
<<<<, ====, and >>>>) and then do cg-commit(1) yourself. cg-commit(1) will know that you are committing a merge and will record it properly..sp Note that when you are merging remote
branches, cg-merge(1) will use them in the state they are currently at in your repository. If you want to fetch the latest
changes from the remote repository, use cg-fetch(1). If you want to fetch the changes and then merge them to your branch, use the
command cg-update(1)..sp Also note that if you have local changes in your tree that you did not commit, cg-merge will always preserve them when fast-forwarding. When doing a tree merge, it will
preserve them if they don't conflict with the merged changes, and
report an error otherwise. In short, it should do the Right Thing
(tm), never lose your local changes and never let them mix up
with the merge..sp

OPTIONS

Array-h, --help

Print usage summary.

--long-help

Print user manual. The same as found in cg-merge(1).

HOOKS

Arrayflicts", "nocommit", or "ok".

COPYRIGHT

Copyright © Petr Baudis, 2005.sp

SEE ALSO

Array12/05/2006

CG-MERGE(1)