Skip to content

delete: rebase onto the correct branch#5358

Merged
kevgo merged 2 commits intomainfrom
kg-fix-delete-bug
Aug 7, 2025
Merged

delete: rebase onto the correct branch#5358
kevgo merged 2 commits intomainfrom
kg-fix-delete-bug

Conversation

@kevgo
Copy link
Contributor

@kevgo kevgo commented Aug 7, 2025

Removing commits when deleting a branch from a stack rebased onto the wrong
parent branch. This PR fixes that.

part of #5156

@kevgo kevgo merged commit bfe280f into main Aug 7, 2025
5 checks passed
@kevgo kevgo deleted the kg-fix-delete-bug branch August 7, 2025 21:01
tmeijn pushed a commit to tmeijn/dotfiles that referenced this pull request Aug 12, 2025
This MR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [git-town/git-town](https://github.com/git-town/git-town) | patch | `v21.4.1` -> `v21.4.2` |

MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot).

**Proposed changes to behavior should be submitted there as MRs.**

---

### Release Notes

<details>
<summary>git-town/git-town (git-town/git-town)</summary>

### [`v21.4.2`](https://github.com/git-town/git-town/releases/tag/v21.4.2)

[Compare Source](git-town/git-town@v21.4.1...v21.4.2)

##### Bug Fixes

- Git Town no longer mistakes legit file conflicts for phantom conflicts ([#&#8203;5156](git-town/git-town#5156), [#&#8203;5140](git-town/git-town#5140))
- delete: Git Town now rebases onto the correct branch ([#&#8203;5358](git-town/git-town#5358))

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever MR is behind base branch, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this MR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box

---

This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS42MS4xIiwidXBkYXRlZEluVmVyIjoiNDEuNjEuMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiUmVub3ZhdGUgQm90Il19-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

Comments