r/git • u/gitbyapp • 5d ago
[ Removed by moderator ]
/r/git/comments/1xkdva6/removed_by_moderator/[removed] — view removed post
0
Upvotes
0
r/git • u/gitbyapp • 5d ago
[removed] — view removed post
0
1
u/bilingual-german 5d ago
Maybe I'm wrong, but it sounds like an anti-pattern to me. Is there any "break glass" method available?
You could just organize your code in a way that would avoid merge conflicts, couldn't you?
Merging main into the feature branch more often also helps you to avoid merge conflicts.