Github-style Branching and Merging

Branching in Crownpeak seems to take a snapshot of an asset that when later published totally ignores changes made to the live asset.  If Github-style merging was enabled it would dramatically reduce the overhead involved with multiple people working on the same asset.  We've encountered either problems with branches overwriting changes made to live since the branch was created.  To combat that we've incurred additional overhead in both applying changes to multiple assets to be sure they are not lost, or managing complex relationships when we go to release.

12 Comments
Michelle
I'm new here

👍Kudos for this idea

cgleason
New Creator

It would be great if Crownpeak can make this possible 🙏

furtadofied
New Creator

This is probably the most vital aspect that slows down the ability for users to make different change to the same page and retain both changes as each is merged to the main page. 

emb-isaac
Occasional Observer

Since Crownpeak already has diff support, an option to review the diff before merging would be helpful and could alleviate some of these issues.

mburgess
Elite Observer

We are using diff before merging, but is a very time-consuming and high risk process for someone not familiar with the nature of changes having been made.

jakethecorn
New Creator

Yeah, we really need this

emb-isaac
Occasional Observer

Diff support from File View would be another good option - using checkbox next to 2 different assets or Right Click > Select for Compare as in VSCode

mburgess
Elite Observer

@emb-isaac Comparing versions is already possible (for most assets in our experience) using the versions window.

emb-isaac
Occasional Observer

@mburgess I assume you mean from Properties > Versions? I was referring to comparing 2 different assets in the File View, that way you can choose 2 different branches (e.g. compare live & dev). I didn't think there was a way to compare 2 branched files right now? 

Also, some of our users will clone an asset instead of branching - losing all the versioning history. Comparing the clone with an archived or retired asset would be helpful.

j-krishnan
New Spectator

This will solve the difficulties which we are facing during development when multiple developers have to work on the same asset.