Update README_LINUX.md #4397
Update README_LINUX.md #4397
Conversation
Changed the url to Debian Multimedia team.
|
Thanks! Please rebase this against 3.10 -- see our contributor's guide for more information. |
|
Can I rebase this commit (i have already deleted my patch/branch from my profile) or must I pull the 3.10 branch and make the edit again? If I can rebase the commit itself, I'm not sure I know how. In other case, should I pull devel branch, make an edit, commit, rebase into 3.10 and then force push? Apologies for my cluelessness. |
|
ok i was spending couple of hours trying to follow instruction on contributor's guide,making fork, cloneing to my local machine, creating branch and then failing at rebasing to 3.10. and now I see this was resolved by someone? what just happened? confused, but I don't want to take too much time from devs. edit: the question is how should i do this next time? |
|
sorry about the confusion! SC development is based on the git-flow model, where development takes place mainly on two branches: we merge changes into the if you make a new PR against develop when it's really a bug fix that should go against 3.10, we have two different strategies:
there's been a little disagreement on whether we should go with 1 (which puts responsibility on the PR author to do a tricky git operation) or with 2 (which puts responsibility on maintainers, and we're currently grinding through a backlog of 50+ PRs). brian prefers requesting the PR author, while i'm pro-cherrypick, and i suggested to patrick to do the merge. sorry you got caught in the crossfire here. also if you need any help with git stuff, feel free to ask on slack! |
Cherry-pick #4397 into 3.10 branch
|
that's alright. thanks for all the explanation.
I do actually want to learn more git (and perhaps contribute more) so i followed instructions:
* fork on github
* clone my fork `git clone --recursive https://github.com/novadeviator/supercollider.git`
* create topic branch with `git checkout -b topic/fix-linux_readme develop`
* make edits
* commit `git commit -a`
* trying to rebase with `git rebase -i --onto 3.10 develop topic/fix-linux_readme`
where I got stuck with error:
```
fatal: Needed a single revision
Does not point to a valid commit: 3.10
```
does that mean I don't have 3.10 branch? or I did something wrong elsewhere?
|
|
yes, that'd be because you don't have the 3.10 branch. |
Changed the url to Debian Multimedia team.
Purpose and Motivation
Types of changes
To-do list