archimatetool / archi-modelrepository-plugin

coArchi - a plug-in to share and collaborate on Archi models.
153 stars 52 forks source link

[Feature Request] Cherry Pick #99

Closed VinceAxe closed 2 years ago

VinceAxe commented 5 years ago

As the modelization can be a bit faster than thinking, it might happen to work on a branch for a specific feature, and add some change for the master branch, but without switching into it

A cherry pick of this commit inside the master could be a solution, instead of having to discard the changes, switching branch, and re-do the same work

This might have a lot of side effects and conflicts though, and it may be a feature with a lot of warnings only for people knowing what they do

jbsarrodie commented 5 years ago

This might have a lot of side effects and conflicts though, and it may be a feature with a lot of warnings only for people knowing what they do

Even more than you think. A similar feature used to be possible (undoing one specific commit) but raised so many issues that we decided to remove it.

The key point is that a commit only contains diff from previous commit, and most of the time, this diff can't be applied on another branch (some objects created on previous commits are missings, etc...)