Allow resolving conflicts for individual hunks instead of the whole file

prati0100 / git-gui

Tcl/Tk based UI for Git. I am currently acting as the project's maintainer.

161 stars 87 forks source link

Allow resolving conflicts for individual hunks instead of the whole file #10

Open prati0100 opened 4 years ago

prati0100 commented 4 years ago

If there is a file with merge conflicts, git-gui shows options to resolve the conflicts as "ours" or "theirs". But, this resolution applies to the whole file, not individual hunks.

Allowing resolving conflicts per-hunk would be a nice quality-of-life enhancement.