Warn user when applying a duplication

softwarefactory-project / rdopkg

power to the packagers

Apache License 2.0

28 stars 21 forks source link

Warn user when applying a duplication #133

Open barrh opened 7 years ago

barrh commented 7 years ago

When rebasing and applying patches, it is possible that git would fail to identify a patch is already included within the target upstream release. Resulting in full/partial code duplication - without conflict. This could be avoided by comparing downstream-only patch names and/or their (pre-rebase) content, with patches that were added in upstream since the last rebase.

yazug commented 6 years ago

if you have a -patches branch git does this work for you.