DEV Community

Discussion on: How to cleanup a branch (PR) with huge number of commits

View post

Replies for: Hm, there was some post here, but now it's gone, while I was already answering. Here my answer: We already do trunk-based development. And also we...

Collapse
 
benjioe profile image
Benjioe •

Yes, I deleted it because your on a open source project, so that's not relevant ...

Collapse
 
albertzeyer profile image
Albert Zeyer •

Yes? What was not relevant about it? You mentioned trunk-based development, which is relevant. I thought also your other points might have been valid options.

Thread Thread
 
benjioe profile image
Benjioe • • Edited

Yeah, you true, so that's was :

Maybe you can :

  • Create a new branch from master when you need unrelated changes, merge it and rebase your feature branch.
  • Or use Trunk Base Development where your branches lives 1 day max
  • Ask yourself, do your really need a clean history ? Or good comments are good enough ? (not for code-maat)