Email or username:

Password:

Forgot your password?
Top-level
Keith Gable :whyfox:๐Ÿ‡บ๐Ÿ‡ฆ๐ŸŒป

@marcan leave a comment with a line that is /rebase. Can be the only text, then it is silent and doesnโ€™t leave a comment but rebases anyways.

Locally you git pull --rebase

If the project is configured a certain way, this shows up as a button

3 comments
Hector Martin

@ZiggyTheHamster The goal there was the squash though (hence interactive rebase), can it do that?

Keith Gable :whyfox:๐Ÿ‡บ๐Ÿ‡ฆ๐ŸŒป

@marcan it can, but itโ€™s a MR strategy. I forget some people want their MRs to be squashed separately from the merge process.

The config I prefer as a GitLab repo owner is to do squash merges with semi linear history, and then the merge button does that for you (and you can rebase in the UI without the command). This is so easy to work with and is the best of both worlds because you can always look at the pre-squashed history in the MR.

Keith Gable :whyfox:๐Ÿ‡บ๐Ÿ‡ฆ๐ŸŒป

@marcan so in your case I donโ€™t think you can do it differently, but they can configure the project to make this automatic

Go Up