Skip to content

Commit 1f7824d

Browse files
committed
fixing ci/cd
1 parent 3a232f9 commit 1f7824d

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

articles/data-factory/source-control.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ The configuration pane shows the following GitHub repository settings:
152152

153153
- GitHub integration with the Data Factory visual authoring tools only works in the generally available version of Data Factory.
154154

155-
- A maximum of 1,000 entities per resource type (such as pipelines and datasets) can be fetched from a single GitHub branch. If this limit is reached, is suggested to split your resources into separate factories.
155+
- A maximum of 1,000 entities per resource type (such as pipelines and datasets) can be fetched from a single GitHub branch. If this limit is reached, is suggested to split your resources into separate factories. Azure DevOps Git does not have this limitation.
156156

157157
## Switch to a different Git repo
158158

@@ -244,9 +244,14 @@ If the publish branch is out of sync with the master branch and contains out-of-
244244

245245
1. Remove your current Git repository
246246
1. Reconfigure Git with the same settings, but make sure **Import existing Data Factory resources to repository** is selected and choose **New branch**
247-
1. Delete all resources from your collaboration branch
248247
1. Create a pull request to merge the changes to the collaboration branch
249248

249+
Below are some examples of situations that can cause a stale publish branch:
250+
- A user has multiple branches. In one feature branch, they deleted a linked service which is not AKV associated (non AKV linked services are published immediately regardless if they are in Git or not) and never merged the feature branch into the collaboration brnach.
251+
- A user modified the data factory using the SDK or PowerShell
252+
- A user moved all resources to a new branch and tried to publish for the first time. Linked services should be created manually when importing resources.
253+
- A user uploads a non AKV linked service or an Integration Runtime JSON manually. They reference that resource from another resource such as a dataset, linked service, or pipeline. A non-AKV linked service created through the UX is published immediately becausethe credentials need to be encrypted. If you upload a dataset referencing that linked service and try to publish, the UX will allow it because it exists in the git environment. It will be rejected at publish time since it does not exist in the data factory service.
254+
250255
## Provide feedback
251256
Select **Feedback** to comment about features or to notify Microsoft about issues with the tool:
252257

0 commit comments

Comments
 (0)