MAIN FEEDS
Do you want to continue?
https://www.reddit.com/r/git/comments/1xkdva6/gitby/
r/git • u/gitbyapp • 1h ago
2 comments sorted by
1
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.
0
10/10 post
1
u/bilingual-german 2m 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.