• 0 Posts
  • 27 Comments
Joined 4 months ago
cake
Cake day: March 21st, 2024

help-circle

















  • What do you mean? Like not pushing at all until you’re making the MR? Because if the branch has ever been pushed before and you rebase, you’re gonna need to force push the branch to update it.

    Not everyone works in large orgs that require pull requests. We have a dev branch multiple devs push to and just branch off for test phase. So I commit locally (also interactive rebasing when fixing stuff from earlier). When I’m ready to push, I fetch, rebase and push. I never force push here.


  • I was replying to the other comment, not yours.

    I know. Answered anyway because I thought of the same thing as you.

    Though there’s not really a way of using rebasing without force pushing unless it’s a no-op.

    I like to rebase after fetching and before pushing. IMO that’s the most sensible way to use it even in teams that generally prefer merge. It’s also not obvious to beginners since pull is defaulted to fetch+merge.