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

Add guidelines for rebasing develop branch to release-v* to Kolibri Developer Documentation #11361

Closed
MisRob opened this issue Oct 6, 2023 · 5 comments
Assignees
Labels
good first issue Self-contained, straightforward, low-complexity help wanted Open source contributors welcome TAG: developer docs Technical docs and code comments

Comments

@MisRob
Copy link
Member

MisRob commented Oct 6, 2023

Summary

Especially before a new release, we sometimes guide contributors to rebase their pull request from develop to release-v* branch. There's a helpful guidance by @rtibbles in #11337 (comment):

  • Make sure you have local versions of the Learning Equality develop branch and the Learning Equality release-v0.16.x branch and that they are both up to date - for the sake of the following, I will assume they are called develop and release-v0.16.x respectively.
  • Locally, checkout your feature branch
  • Run this rebase command: git rebase --onto release-v0.16.x develop this will rebase your current branch (your feature branch) onto release-v0.16.x, removing any commits that are already present in develop - so, if everything works as expected, it should keep your commit bugfix- birth year selction
  • Once you have done that, you will need to force push to update your remote branch git push --force - if the remote branch is not set, then git should give you hints about how to push to the correct remote branch.

It'd be great to move it to Kolibri Developer Documentation as a new page in How To Guides.

release-v* should be used instead of release-v0.16.x so that the guidelines are applicable for any future releases.

Value Add

Efficiency

Guidance

@MisRob MisRob added TAG: developer docs Technical docs and code comments help wanted Open source contributors welcome good first issue Self-contained, straightforward, low-complexity labels Oct 6, 2023
@RISHIKESHk07
Copy link

hey @MisRob could i contribute to this

@MisRob
Copy link
Member Author

MisRob commented Oct 10, 2023

Hi @RISHIKESHk07, yes, thank you

@Tweniee
Copy link
Contributor

Tweniee commented Nov 8, 2023

@MisRob i made the changes and created a PR, if any change needed please let me know
PR:#11509

@MisRob
Copy link
Member Author

MisRob commented Nov 8, 2023

Thanks @Tweniee, I will have a look some time this week

@MisRob MisRob assigned Tweniee and unassigned RISHIKESHk07 Nov 8, 2023
MisRob added a commit that referenced this issue Nov 28, 2023
Tweniee/Isssue:#11361 Updated Document for PR release
@MisRob
Copy link
Member Author

MisRob commented Dec 7, 2023

Closed by #11512

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
good first issue Self-contained, straightforward, low-complexity help wanted Open source contributors welcome TAG: developer docs Technical docs and code comments
Projects
None yet
Development

No branches or pull requests

5 participants