Victor Hu
9ab009e7ba
Improve the content of the conflict resolution
...
Improve some wording in the conflict resolution section to make it more clear after running through the steps this week
2015-10-08 09:31:02 -04:00
Victor Hu
f2b7757628
Fixed some of the WARNING and ERROR messages that are coming out doing a
...
'make clean' then 'make html' for the documentation. There are a lot
of formatting errors that are present
Also fixed some of the broken links. When pages are added and changed
the person working on it should check the build errors
2015-09-30 12:25:40 -04:00
Xiaopeng Wang
1bf7d6c506
Update pull_request.rst
...
Add '-f' for 'git push' after changed the commit by 'git rebase' or 'git commit --amend'
2015-09-23 15:50:20 +08:00
wangxiaopeng
cbaa8b8ae2
Chnage how to use pull request in doc:
...
How to add more change for a pull request
How to resolve conflict for a pull request
2015-09-21 10:47:30 -04:00
Victor Hu
0e131821ce
Added information about stashing work before switching to update the
...
master branch of your forked repo as to not lose any umcommited changes
that may be in progress
2015-09-21 14:21:33 +08:00
WangXiaoPeng
7b8072ce01
Doc Change: syncing_forks.rst
...
Add [git checkout master] before pull from upstream
2015-09-21 14:21:33 +08:00
wangxiaopeng
224627f600
fix a typo
2015-09-21 14:21:33 +08:00
wangxiaopeng
5ae100b516
Simplify the steps to update forked repository
2015-09-21 14:21:33 +08:00
wangxiaopeng
eba708e40f
fix the internal link target issue
2015-09-02 04:07:00 -04:00
wangxiaopeng
eed9d8b1ff
remove a .swp file
2015-09-02 01:27:57 -04:00
wangxiaopeng
8a5c522292
Add example to show how to edit doc:
...
Section format
List format
Link/Reference
Footnotes
Comments
Table
Literal block/word
2015-09-02 01:26:33 -04:00
wangxiaopeng
38f7c13f88
Update doc Guidelines base on comments
2015-09-01 12:22:53 -04:00
wangxiaopeng
71318e9b69
Add a Doc edit tips page
...
How to add links
How to add OS specific branches
2015-09-01 09:10:51 -04:00
Xiaopeng Wang
57e1c944cb
Merge pull request #124 from whowutwut/git_tutorial
...
Added Github documentation reference for forking/branch/pull request
2015-08-28 18:39:22 +08:00
Victor Hu
24a080fd3e
Create pdf files of the agreements for the contributor license agreements.
...
To be consistent with the maintainer agreement, provide downloadble pdf
files for contributors to print and sign. This makes the form that is
returned to us more consistent as well.
2015-08-27 11:27:52 -04:00
Victor Hu
828b807c5b
Initial commit for GitHub reference documentation for forking/branching/pullrequest
2015-08-27 10:19:04 -04:00
Victor Hu
78ae3adbe7
The CLAs should stay in the xCAT documentation instead of being put in the wiki
...
pages on the xcat-core project. Removing those files and cleaning up the
agreements under the docs directory
2015-08-26 15:53:05 -04:00
Victor Hu
dfe749793c
Staging files under xcat-doc/doc to get moved to xcat-core project
2015-08-20 15:54:56 -04:00
