Some guide lines:
- Pull from https://github.com/FreeCAD/FreeCAD
- When you done developing, rebase your branch to the master branch of the above repos
- Post a pull request on this forum with a description of what you've done
ToBeDone...
Code: Select all
git push https://github.com/KeithSloan/FreeCAD_sf_master.git yourbranch
optionally you can generate a summery of your changes to put it into your pull requestgit://github.com/KeithSloan/FreeCAD_sf_master.git yourbranch
Code: Select all
git request-pull origin/master git://github.com/KeithSloan/FreeCAD_sf_master.git yourbranch
abdullah wrote:4. One very last thing. I have read the sticky post for pull requests (I think by wmayer). It talks about rebasing before pull request (to make integrator life easier, which is something I really would like). Does this mean that if before posting the pull request I do:Code: Select all
git checkout FeatureK git rebase master git checkout master git merge FeatureK (fast-forward merge)
shoogen wrote:You don't have to do the merge. If the rebase finishes successfully, it the merge will be fast-forward. If not it reveals problems, that needs to be resolved. Since somebody else might commit to the blessed repository, the integrator, will probably have to rebase your branch onto a never version of the master branch, again. But the main benefit is that this will reveal the merge conflicts to you, so you can solve them before issuing the pull request.
1) You can already - just ensure the activity feed is visible in GitterKunda1 wrote:It would be whimsical and fun but for sure not essential, to have a way to know when someone has sent a PR to the FC repo.
Not sure how.