Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Warn user when applying a duplication #133

Open
barrh opened this issue Jul 20, 2017 · 1 comment
Open

Warn user when applying a duplication #133

barrh opened this issue Jul 20, 2017 · 1 comment

Comments

@barrh
Copy link

barrh commented Jul 20, 2017

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
Copy link
Contributor

yazug commented Nov 6, 2017

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

3 participants