Merging GIT Master and Branches

This forum is for all Flare issues related to using Source Control.
Post Reply
karent
Jr. Propeller Head
Posts: 2
Joined: Sun Dec 31, 2017 2:04 am

Merging GIT Master and Branches

Post by karent »

Hi everyone,

We are using a GIT source control system (GITLab) and are a large organization with hundreds of documents and geographically dispersed writers.
We are trying a pilot to share a project, that has a GIT master and about 6 branches.
Switching branches in Flare has caused performance issues.
Merging from branches to the master and from the master to branches is virtually impossible to do in GITlab...
Has anyone used Flare project import files to perform the merging?
Any case studies of how you have managed your source control system would be great!

Thank you!
Karen
Post Reply