You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: documentation/project-docs/SDK-PR-guide.md
+2-1Lines changed: 2 additions & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -74,6 +74,7 @@ These PRs will not get updated as new changes come in. This allows time to run P
74
74
### Reviewing and merging inter-branch codeflow
75
75
Generally we will check the commit list and scan the changes for anything out of the ordenary. We take a special look for any conflict merges that were done in getting the PR building.
76
76
77
-
[!Important] Make sure to create a merge commit. Do not squash. If you squash, the next inter-branch PR will list all of the same commits.
77
+
> [!Important]
78
+
> Make sure to create a merge commit. Do not squash. If you squash, the next inter-branch PR will list all of the same commits.
78
79
79
80
**NOTE** Some inter-branch flow will have 0 changes once the merge conflicts are resolved. This is likely when the only changes were to version numbers in the eng/*. These can be closed to save time and resources or merged to catch the commit history up (the next codeflow will have fewer commits). There is no preference either way.
0 commit comments