search

fork-dev / Tracker

Bug and issue tracker for Fork for Mac
508 stars 12 forks source link

[Feature] Resolve all conflicts by prioritizing one of the branches being compared #2002

Open T3kla opened 11 months ago

T3kla commented 11 months ago

Feature description

When merging or rebasing, resolve all possible conflicts between two branches by prioritizing one of the branches over the other.

Why

I recently found myself rebasing a 173 commit branch that has been consistenly pulling develop, so I know what's inside is up to date and that concflicts has been resolved in-branch. That doesn't stop the rebase from prompting me 173 times about conflicts that already has been resolved.

Therefore, I'd like a way to tell Fork "trust me bro, just pick everything from this branch".

image

DanPristupov commented 11 months ago

rebasing a 173 commit branch

I think that is a very unusual use. May be you need to use CLI and use the famous rerere command (https://www.git-scm.com/book/en/v2/Git-Tools-Rerere)

T3kla commented 11 months ago

Well indeed it is a really unusual usecase, but it is not that unusual when there is no Lead Programmer in the team...

About the command, that is almost exactly what I was looking for. Thank you for sharing.

If there is no intention of adding this feature into Fork, you may close the issue, I'm fine with using the CLI.

DanPristupov commented 11 months ago

If there is no intention of adding this feature into Fork

I'd say, I don't see to to make an intuitive feature out of it.