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

GitLens "Pull with Rebase" is not rebase, but merge #3909

Closed
yakamoz423 opened this issue Jan 3, 2025 · 3 comments
Closed

GitLens "Pull with Rebase" is not rebase, but merge #3909

yakamoz423 opened this issue Jan 3, 2025 · 3 comments
Assignees
Labels
Milestone

Comments

@yakamoz423
Copy link

Description

My repo have a git submodule, so in commit view, there are 2 repos listed:

Image

Click the button circled in red, then "Pull with Rebase":

Image

My first repo generated a Merge commit. This is not a rebase.

If there is 1 repo only, it works fine.

GitLens Version

2025.1.104 pre-release

VS Code Version

Version: 1.96.2 (system setup)
Commit: fabdb6a30b49f79a7aba0f2ad9df9b399473380f
Date: 2024-12-19T10:22:47.216Z
Electron: 32.2.6
ElectronBuildId: 10629634
Chromium: 128.0.6613.186
Node.js: 20.18.1
V8: 12.8.374.38-electron.0
OS: Windows_NT x64 10.0.26100

Git Version

git version 2.47.0.windows.2

Logs, Screenshots, Screen Captures, etc

No response

@yakamoz423 yakamoz423 added bug triage Needs to be looked at labels Jan 3, 2025
@eamodio eamodio added this to the 16.2 milestone Jan 3, 2025
@axosoft-ramint axosoft-ramint self-assigned this Jan 6, 2025
@axosoft-ramint axosoft-ramint removed the triage Needs to be looked at label Jan 6, 2025
@axosoft-ramint axosoft-ramint added pending-release Resolved but not yet released to the stable edition needs-verification Request for verification labels Jan 6, 2025
@axosoft-ramint
Copy link
Contributor

@yakamoz423 Can you please verify this fix in tomorrow's (v2025.1.07XX) pre-release edition of GitLens? Thank you so much!

You can switch to the pre-release edition of GitLens, by clicking on the "Switch to Pre-Release version of this extension" from the Extensions view.

image

@yakamoz423
Copy link
Author

fixed on 2025.1.704, thanks!

@axosoft-ramint axosoft-ramint added verified ✔ Verified and removed needs-verification Request for verification labels Jan 7, 2025
Copy link

github-actions bot commented Feb 7, 2025

This issue has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 7, 2025
@d13 d13 removed pending-release Resolved but not yet released to the stable edition bug labels Feb 11, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

No branches or pull requests

4 participants