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.

Sign up for GitHub

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

Jump to bottom

Import new upstream version 2.1.2.0 #9

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Import new upstream version 2.1.2.0 #9

wants to merge 4 commits into from

Conversation

aderbenev
Copy link
Member

No description provided.

@aderbenev
Copy link
Member Author

@mark0n @mdavidsaver any git guru hint on why my gbp import-orig created the Merge pull request #7 from chrschroeder/upstream commit here? Was the previous upstream update (2.1.1.0) not imported in master properly somehow? I don't see any apparent issues arising from that, but can't understand that effect.

And while you're here, should we get rid of that helper script patch or just let it be?

@mdavidsaver
Copy link
Contributor

gbp import-orig

I would often add --no-merge and then merge upstream into master myself (or rebase the packaging).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@aderbenev @mdavidsaver