Merge

Join two development histories of a component together.

Synopsis

bit merge [-o|--ours] | [-t|--theirs] | [-m|--manual] <version> <component_ids>

Examples

Choose local file modifications to resolve a merge conflict

bit merge --ours 0.0.1 foo/bar

Choose remote file modifications to resolve a merge conflict

bit merge --their 0.0.1 foo/bar

Set all conflicted modifications of a file to resolve manually

bit merge --manual 0.0.1 foo/bar

Options

-o, —ours

bit merge --ours 0.0.1 foo/bar

-t, —theirs

bit merge --theirs 0.0.1 foo/bar

-m, —manual

bit merge --manual 0.0.1 foo/bar
  • cli login
  • cli move