2
0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-22 03:32:04 +00:00

11 Commits

Author SHA1 Message Date
Victor Hu
f000802d96 Update index.rst
fix mispelling
2015-10-26 16:54:57 -04:00
Victor Hu
9c6de4b1c3 Fix some spelling errors
Fix some spelling errors again.
2015-10-08 10:40:16 -04:00
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
Victor Hu
828b807c5b Initial commit for GitHub reference documentation for forking/branching/pullrequest 2015-08-27 10:19:04 -04:00