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

..

change_code.rst

Initial commit for GitHub reference documentation for forking/branching/pullrequest

2015-08-27 10:19:04 -04:00

create_branches.rst

Initial commit for GitHub reference documentation for forking/branching/pullrequest

2015-08-27 10:19:04 -04:00

delete_branches.rst

Initial commit for GitHub reference documentation for forking/branching/pullrequest

2015-08-27 10:19:04 -04:00

forks.rst

Initial commit for GitHub reference documentation for forking/branching/pullrequest

2015-08-27 10:19:04 -04:00

github-behind_master.png

Initial commit for GitHub reference documentation for forking/branching/pullrequest

2015-08-27 10:19:04 -04:00

github-create_branch.png

Initial commit for GitHub reference documentation for forking/branching/pullrequest

2015-08-27 10:19:04 -04:00

github-create_pullrequest.png

Initial commit for GitHub reference documentation for forking/branching/pullrequest

2015-08-27 10:19:04 -04:00

github-even_with_master.png

Initial commit for GitHub reference documentation for forking/branching/pullrequest

2015-08-27 10:19:04 -04:00

github-fork.png

Initial commit for GitHub reference documentation for forking/branching/pullrequest

2015-08-27 10:19:04 -04:00

github-merge_command_line.png

Initial commit for GitHub reference documentation for forking/branching/pullrequest

2015-08-27 10:19:04 -04:00

github-merge_step1.png

Initial commit for GitHub reference documentation for forking/branching/pullrequest

2015-08-27 10:19:04 -04:00

github-pullrequest_branch.png

Initial commit for GitHub reference documentation for forking/branching/pullrequest

2015-08-27 10:19:04 -04:00

index.rst

Initial commit for GitHub reference documentation for forking/branching/pullrequest

2015-08-27 10:19:04 -04:00

pull_request.rst

Improve the content of the conflict resolution

2015-10-08 09:31:02 -04:00

syncing_forks.rst

Added information about stashing work before switching to update the

2015-09-21 14:21:33 +08:00