How do I merge branches?
I have created a duplicate project using version control in DSS. I have created the changes that I would like to make and would now like to merge this branch to the master branch.
The instructions under Merging Branches aren't clear enough for me to accomplish this. Do I need to activate a "remote" and work outside of DSS to achieve this merging?
Is there an instructional video on how to do this or could someone please post an instructional guide?
Thank you
Best Answer
-
Miguel Angel Dataiker, Dataiku DSS Core Designer, Dataiku DSS ML Practitioner, Dataiku DSS Adv Designer, Registered Posts: 119 DataikerHi,
Merging branches is not available directly from DSS. This is because we can take advantage of the methodology native to Git to do so. Consequently, the documentation mentions the steps of creating a remote, doing a pull request and finally pulling the merged branch back.
Since the merging happens outside of DSS we do not have specific information about the individual steps. Nevertheless, documentation about it is abundant depending on where the remote is located. For example, for GitHub
Answers
-
CoreyS Dataiker Alumni, Dataiku DSS Core Designer, Dataiku DSS Core Concepts, Registered Posts: 1,149 ✭✭✭✭✭✭✭✭✭Hi @Rickh008
I don't have a video unfortunately but how about this tutorial/resource in the Knowledge Base while you wait for a more complete response:I hope this helps!
-
Thanks @CoreyS
but I think I need some additional instruction. This resource also makes reference to merging branches outside of Dataiku. I think I need to read up on using Git with DSS."In order to merge the changes with the master branch, do that in the normal way outside of Dataiku."
-
Hello Dataiku Team,
As part of my recent work, I have been able to successfully perform branch merging within Dataiku’s Git integration. However, I have identified a few limitations and observations that may impact the development workflow:
- Merge Process Limitations
- Currently, to perform a merge, we need to first switch to the target branch and then initiate the merge by selecting the source branch.
- There is no clear or structured interface for explicitly selecting both source and target branches upfront, which can make the process less intuitive and more error-prone compared to standard Git workflows.
- Lack of Code Review / Approval Mechanism
- Dataiku’s Git integration does not provide an option to add reviewers or enforce approvals before merging.
- This limitation may result in code being merged without proper validation, increasing the risk of introducing unverified changes into critical branches.
- Access Control Constraints
- Git operations within Dataiku (such as branch management and merging) require Project Admin-level access.
- Users without this level of access are unable to view or perform Git actions.
- Additionally, providing admin access broadly can introduce risks, as users may accidentally delete branches, potentially leading to code loss.
Given the above observations, could you please suggest best practices or recommended approaches in Dataiku to:
- Implement a more controlled and structured Git workflow
- Enable or integrate code review/approval mechanisms
- Manage access control securely while still allowing necessary Git operations for the DS team
Your guidance will help us design a robust and scalable development workflow.
Thank you for your support.
- Merge Process Limitations
