I'm looking to create a workflow for my team, using GitLab as a cooperative platform.
I was checking the other topics related to this, but I'm not really sure if the following scenario is possible:
We have 2 branches: the first one is the online version of our application and the other one is the offline version of the app. If we add a feature in the offline version, we will want to take that commit and add it to the online version too.
Is this possible?
If you do a merge request, this is generally from one branch (with all its commits) to another.
You might consider acherry-pick of one commit to another branch, but that works if you never merge those two branches (or you would end up with a log of duplicate commits).
Merge requests do support cherry-picking a commit.
You can create a MR automatically, but your script should include a check for relevant commit messages, to determine if an MR is needed (Ie, in your case, if a commit adds a new feature).
