Kevin Goslar

Results 334 comments of Kevin Goslar
trafficstars

Re-reading the Stack Overflow post, several people claim that pushing the main commit is somehow possible if the commit matches one in an existing green pull request. If this works...

`git town compress` and `git town compress --stack` are now available in v14. I'm curious if this helps with shipping stacks!

Another thing that could help here is that `git ship` syncs all descendents in the stack right before shipping (https://github.com/git-town/git-town/issues/764). This allows using `git checkout --ours` to resolve merge conflicts...

Thanks for this experience report! It sounds like the biggest problem with GitHub's merge queue is double-testing of each pull request. Apart from that performance problem, does shipping a branch...

@tranhl now that `git town compress` is available, have you had a chance to try out the idea of a fast-forward merge that you described in https://github.com/git-town/git-town/issues/3236#issuecomment-2024175255? If that works...

> I managed to set aside some time to test fast-forward merging, and can confirm that fast forward merging works! This is really awesome news! 🔥 > The downside is...

I can confirm that this works. GitHub even deletes the remote branch when doing this!

This is now released in [Git Town 16](https://github.com/git-town/git-town/releases/tag/v16.0.0). Please try it out and let us know how it goes!

You are correct, right now the implementation only renames the config setting key without updating its value. While that's expected behavior for a simple key rename, in this case, we...

@bengeois excellent work! :bow: