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

Document intro and outro markers #252

Closed
wants to merge 10 commits into from
Closed

Document intro and outro markers #252

wants to merge 10 commits into from

Conversation

Goodiec
Copy link
Contributor

@Goodiec Goodiec commented Oct 25, 2020

This a pull request for this issue - #146
Kindly review

@Holzhaus
Copy link
Member

Please fetch the latest state from upstream and rebase on upstream/manual-2.3.x to fix the issues (not your fault, these existed in manual-2.3.x).

@Goodiec
Copy link
Contributor Author

Goodiec commented Oct 25, 2020

Please fetch the latest state from upstream and rebase on upstream/manual-2.3.x to fix the issues (not your fault, these existed in manual-2.3.x).

Okay, let me try that. Thank you

@Holzhaus
Copy link
Member

Holzhaus commented Oct 25, 2020

No, I meant rebasing:

git remote add upstream https://github.com/mixxxdj/manual.git
git fetch upstream
git rebase upstream/manual-2.3.x
git push -f origin manual-2.3.x

@Goodiec
Copy link
Contributor Author

Goodiec commented Oct 25, 2020

No, I meant rebasing:

git remote add upstream https://github.com/mixxxdj/manual.git
git fetch upstream
git rebase upstream/manual-2.3.x
git push -f origin manual-2.3.x

Says everything is up to date

@Goodiec
Copy link
Contributor Author

Goodiec commented Oct 25, 2020

I'll close this and refork the repository

@Goodiec Goodiec closed this Oct 25, 2020
@Holzhaus
Copy link
Member

Holzhaus commented Oct 25, 2020

No, that is not necessary. Rebasing should work, no idea why GitHub has issues atm.

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

Successfully merging this pull request may close these issues.

2 participants