Merging remote branches - Cloud

Talend Cloud Data Management Platform Studio User Guide

Version
Cloud
Language
English (United States)
Product
Talend Cloud
Module
Talend Management Console
Talend Studio
Content
Design and Development

About this task

When working on a Git managed project, you can merge remote branches from within your Talend Studio in local mode.

Use the following procedure to merge a remote branch A to another remote branch B.

Procedure

  1. Check out the remote branch B to your Talend Studio as a local branch with the same branch name, by following the steps described in Checking out a remote branch as a local one.
  2. Update the local branch B using the remote branch A as the source to pull from, by following the steps described in Updating a local branch.
  3. Resolve any conflicts that occurred during the branch update, by following the steps described in Resolving conflicts between branches.
  4. Push your local branch B to the remote end, by following the steps described in Pushing changes on a local branch to the remote end.