Best practices to organize the branchs about ADF integrated with Azure DevOps

Question

Best practices to organize the branchs about ADF integrated with Azure DevOps

pmscorca 1,052

Hi,

I'd like to know which possible best pratices to follow about organizing the branchs, starting the collaboration branch, for Azure Data Factory integrated with Azure DevOps (Repos).

Thanks

phemanth 15,765 Reputation points Microsoft External Staff Moderator

2023-12-19T04:06:00.79+00:00

@pmscorcaFollowing up to see if the below answer was helpful. If this answers your query, do click Accept Answer and Yes for was this answer helpful. And, if you have any further query do let us know.

1 answer

Your answer

phemanth 15,765 Reputation points Microsoft External Staff Moderator

2023-12-19T04:06:00.79+00:00

@pmscorcaFollowing up to see if the below answer was helpful. If this answers your query, do click Accept Answer and Yes for was this answer helpful. And, if you have any further query do let us know.

Answer 1

phemanth 15,765 Microsoft External Staff Moderator

@pmscorca

Thanks for recahing out MS Q&A

Here are some best practices for organizing branches in Azure Data Factory integrated with Azure DevOps (Repos):

Use Feature Branches: For all new features and bug fixes, use feature branches. A developer creates a feature branch to make a change.

Pull Requests: Merge feature branches into the main branch using pull requests. After a developer is satisfied with their changes, they create a pull request from their feature branch to the main or collaboration branch to get their changes reviewed by peers.

Maintain High Quality Main Branch: Keep a high quality, up-to-date main branch. After a pull request is approved and changes are merged in the main branch, the changes get published to the development factory.

Trunk-Based Branching Strategy: Edit your ADF factories with a “trunk-based” branching strategy Configure your git repository so that it’s impossible for ADF Studio to make direct edits to the contents of your “main” branch.

Short-Lived Branches: Never let any branches of your git repository exist for longer than a few hours unless they’re named “main” or “adf_publish”.

Remember, the goal is to keep your branch strategy simple. These practices should help you maintain an organized and efficient workflow with Azure Data Factory and Azure DevOps (Repos).

please go through Git branching guidance - Azure Repos | Microsoft Learn

Continuous integration and delivery - Azure Data Factory | Microsoft Learn

Hope this helps. Do let us know if you any further queries.

If this answers your query, do click Accept Answer and Yes for was this answer helpful. And, if you have any further query do let us know.

phemanth 15,765 Reputation points Microsoft External Staff Moderator

2023-12-20T08:54:23.6466667+00:00

@pmscorca

Following up to see if the above answer was helpful. If this answers your query, do click Accept Answer and Yes for was this answer helpful. which might be beneficial to other community members reading this thread. And, if you have any further query do let us know.
pmscorca 1,052 Reputation points

2024-01-03T07:47:06.4966667+00:00

Hi @phemanth , in order to apply the best practice, in my scenario more developers must work together. I think to create below the main branch a developer branch as a collaboration one. So, each developer should work with an own feature branch and then merging it to the develop branch passing by a pull request that requires an approval.

When each feature branch are completed and merged, inside ADF should be possible to publish the entire develop branch.

Is the described strategy good? Other suggests? Thanks
phemanth 15,765 Reputation points Microsoft External Staff Moderator

2024-01-04T04:34:41.73+00:00

@pmscorca

Yes, the strategy you described is a common and effective approach to collaborative development in Azure DevOps. Here’s a breakdown of why it works well:

Feature Branches: Each developer working on their own feature branch allows for isolated development and testing. This reduces the risk of developers overwriting each other’s changes and makes it easier to track who made what changes.

Pull Requests: Using pull requests to merge feature branches into the develop branch ensures that changes are reviewed before they are integrated. This can help catch bugs and maintain code quality.

Develop Branch: Having a separate develop branch that all feature branches are merged into allows you to test all changes together before they are merged into the main branch. This can help catch integration issues.

Publishing from Develop Branch: Once all feature branches are merged and any integration issues are resolved, you can publish from the develop branch. This ensures that what you’re publishing has been thoroughly tested and reviewed.

the key to this strategy is rigorous code review and thorough testing at each step. Also, regular communication among team members is crucial to handle merge conflicts and to keep everyone on the same page.

the best practices can vary depending on the team size, project complexity, and specific requirements. It’s important to choose the strategies that best fit your team’s needs
pmscorca 1,052 Reputation points

2024-01-04T13:01:35.8166667+00:00

Hi @phemanth , thanks for your reply. Could I indicate the related article, please? Thanks
phemanth 15,765 Reputation points Microsoft External Staff Moderator

2024-01-05T05:26:23.2833333+00:00

@pmscorca please go through https://learn.microsoft.com/en-us/azure/devops/repos/git/git-branching-guidance?view=azure-devops
pmscorca 1,052 Reputation points

2024-01-05T09:18:28.2233333+00:00

Hi, I'm referring to the article that talks about "Develop Branch", "Publishing from Develop Branch", etc.

Thanks
phemanth 15,765 Reputation points Microsoft External Staff Moderator

2024-01-08T04:52:26.3766667+00:00

@pmscorca

please go through https://learn.microsoft.com/en-us/azure/data-factory/continuous-integration-delivery-improvements

https://learn.microsoft.com/en-us/azure/data-factory/continuous-integration-delivery

Share via

Best practices to organize the branchs about ADF integrated with Azure DevOps

1 answer

Your answer