Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebasing from remote loads code changed on the remote #506

Merged
merged 2 commits into from
Oct 1, 2024

Conversation

isc-pbarton
Copy link
Collaborator

Fixes #503
We now diff the old head with the new head. Before we diffed the remote branch with the new head, which misses all the changes made on the remote branch.

we now diff the old head with the new head. before we diffed the remote branch with the new head, which misses all the changes made on the remote branch.
Copy link
Collaborator

@isc-tleavitt isc-tleavitt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good - just needs changelog. Glad this was simple!!

@isc-tleavitt isc-tleavitt merged commit 3cb5080 into main Oct 1, 2024
2 checks passed
@isc-tleavitt isc-tleavitt deleted the fix-rebase-remote branch October 1, 2024 17:29
@codecov-commenter
Copy link

⚠️ Please install the 'codecov app svg image' to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

Attention: Patch coverage is 0% with 1 line in your changes missing coverage. Please review.

Please upload report for BASE (main@750a363). Learn more about missing BASE report.

Files with missing lines Patch % Lines
cls/SourceControl/Git/Utils.cls 0.00% 1 Missing ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##             main     #506   +/-   ##
=======================================
  Coverage        ?   25.90%           
=======================================
  Files           ?       17           
  Lines           ?     2459           
  Branches        ?        0           
=======================================
  Hits            ?      637           
  Misses          ?     1822           
  Partials        ?        0           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Merging default remote branch does not import changed code
3 participants