Git Version Control - merging branch
OK, I'll admit it up front, I am new to the Git model and after watching a few introductory videos, I tried to use the Version Control feature of creating a new branch.
I selected the option when creating a new branch, "Edition Mode: User current project to work on new branch". (Yes I know, the documentation says to use "Duplicate project to work on new branch" but that is why I am asking a question now.) 😉
I finished the improvements in the new branch and now I want to merge with the main. I go back to the main but there is no "merge" option. How can I merge the branch with the main?
I read that V13 has some Version Control Git features with Merging. I am not sure if that will solve the problem or if there is an easier way?
Operating system used: Windows
Best Answer
-
Turribeach Dataiku DSS Core Designer, Neuron, Dataiku DSS Adv Designer, Registered, Neuron 2023 Posts: 2,160 Neuron
This is clearly explained in the documentation (see below). There is no built-in merge in V12 and even on v13 the merge is not going to be easy. So you have to do the merge in another tool and good luck with that, because Dataiku stores code and metadata altogether in a JSON format file which is not easy at all to merge when there are conflicts.
My advice is to stay away from Git. Clone a project for major rework or work in a different flow zone. Then move to the new zone when ready. Never Revert a single commit from a project or Revert an object to a revision as it will likely end up with a corrupted project and try to avoid Revert a project to a revision as you will lose all changes done. If you have to revert something you can try Revert an object to a revision, copy the code / whatever you need and go back to a consistent state. So in a nutshell you do have full tracking of changes but rollbacks and branching is not something you want to be involved with as it is not easy.
Answers
-
Thank you for clarifying. This time, I kept the code changes containerized into a Recipe Group so I'll be able to copy/paste changes on the Main within minutes.
If branching and merging is not easy to do within DSS, it is going to complicate more complex changes.