#141 closed defect (fixed)
synchronize changes made in wiki manual with manual in core repository
| Reported by: | felix winkelmann | Owned by: | felix winkelmann |
|---|---|---|---|
| Priority: | major | Milestone: | |
| Component: | documentation | Version: | 4.2.x |
| Keywords: | manual wiki | Cc: | Ivan Raikov |
| Estimated difficulty: |
Description
The manual in the wiki has been heavily modified. These changes have to be merged into the manual of the core git repository, carefully avoiding moving any changes from the core back to the wiki that contain yet unreleased features.
Attachments (2)
Change History (7)
comment:1 Changed 14 years ago by
| Status: | new → accepted |
|---|
comment:2 follow-up: 3 Changed 14 years ago by
Changed 14 years ago by
| Attachment: | svn-16089-16552.patch.txt added |
|---|
SVN 16089-16552 (part 1--grr, 256KB upload limit)
comment:3 Changed 14 years ago by
| Owner: | changed from Jim Ursetto to felix winkelmann |
|---|
Replying to zbigniew:
I've synchronized the changes from the wiki to the core manual, ignoring anything that has been removed from core. I did not synchronize anything from core back to the wiki.
Excellent. Thanks a lot.
I am still trying to figure out how to use git correctly and safely (@#$!@%) and I don't want to delay this commit. So instead of pushing to the repository I am attaching the output of git-format-patch on my branch. I think you can apply this with git-am and perhaps squash it into one commit.
I'll add it, no problem.
If you want me to do a proper merge instead, I need a bit of time so I can figure out what the heck I am doing. ($%#!) Sorry, git makes me feel more stupid than usual.
I feel just the same.
comment:4 Changed 14 years ago by
| Resolution: | → fixed |
|---|---|
| Status: | accepted → closed |
I've synchronized the changes from the wiki to the core manual, ignoring anything that has been removed from core. I did not synchronize anything from core back to the wiki.
I am still trying to figure out how to use git correctly and safely (@#$!@%) and I don't want to delay this commit. So instead of pushing to the repository I am attaching the output of git-format-patch on my branch. I think you can apply this with git-am and perhaps squash it into one commit.
If you want me to do a proper merge instead, I need a bit of time so I can figure out what the heck I am doing. ($%#!) Sorry, git makes me feel more stupid than usual.