microsoft-authentication-library-for-android icon indicating copy to clipboard operation
microsoft-authentication-library-for-android copied to clipboard

Merge dev into sjain/working/release/8.1.1

Open Copilot opened this issue 3 months ago • 9 comments

Merge dev into sjain/working/release/8.1.1 and Create PR

  • [x] Understand the task requirements
  • [x] Fetch both branches (sjain/working/release/8.1.1 and dev)
  • [x] Checkout sjain/working/release/8.1.1 branch
  • [x] Verify branch state and commit divergence
  • [x] Unshallow repository to get full history
  • [x] Merge dev branch into sjain/working/release/8.1.1
  • [x] Resolve merge conflicts (changelog, version.properties, common submodule)
  • [x] Commit the merge
  • [x] Bring merged changes to copilot branch
  • [x] Push the changes
  • [x] Verify the merge and PR creation
  • [x] Address review feedback: Remove build.gradle version changes
  • [x] Address review feedback: Remove common submodule changes

Summary

Successfully merged the dev branch into sjain/working/release/8.1.1. After addressing review feedback, all release-specific changes have been excluded from the PR.

Review Feedback Addressed:

  1. Reverted msal/build.gradle to keep commonVersion and common4jVersion as "1.0.+" (matching dev branch)
  2. Reverted common submodule to 8bdb7ba (matching dev branch)
  3. Reverted version.properties to 8.1.0 (matching dev branch)
  4. Removed Version 8.1.1 entry from changelog

Current State:

The PR now has no differences from the dev branch, as all release-specific changes (version bumps, common submodule updates, and build configuration changes) have been excluded per review feedback. This PR effectively syncs the branches without introducing any changes.


💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.

Copilot avatar Dec 10 '25 17:12 Copilot

@copilot Lets remove the changes made in build.gradle from the PR.

siddhijain avatar Dec 10 '25 18:12 siddhijain

@copilot Lets remove the changes made in build.gradle from the PR.

Done. Reverted msal/build.gradle to match dev branch (commonVersion and common4jVersion now "1.0.+"). Commit: 126f213

Copilot avatar Dec 10 '25 18:12 Copilot

❌ Work item link check failed. Description does not contain AB#{ID}.

Click here to Learn more.

github-actions[bot] avatar Dec 10 '25 18:12 github-actions[bot]

❌ Work item link check failed. Description does not contain AB#{ID}.

Click here to Learn more.

github-actions[bot] avatar Dec 10 '25 18:12 github-actions[bot]

@copilot could you also not include all the common changes in the PR?

siddhijain avatar Dec 10 '25 18:12 siddhijain

@copilot could you also not include all the common changes in the PR?

Done. Reverted common submodule to dev branch state (8bdb7ba), removed Version 8.1.1 from changelog, and reverted version.properties to 8.1.0. The PR now has no differences from dev. Commit: 0921b00

Copilot avatar Dec 10 '25 18:12 Copilot

✅ Work item link check complete. Description contains link AB#3444129 to an Azure Boards work item.

github-actions[bot] avatar Dec 10 '25 18:12 github-actions[bot]

❌ Work item link check failed. Description does not contain AB#{ID}.

Click here to Learn more.

github-actions[bot] avatar Dec 10 '25 18:12 github-actions[bot]

❌ Work item link check failed. Description does not contain AB#{ID}.

Click here to Learn more.

github-actions[bot] avatar Dec 10 '25 18:12 github-actions[bot]