Git - Revision history

Ivan denisov: /* 5. To work with a personal copy of BlackBox project (push requests) */

2014-07-21T17:21:22Z

5. To work with a personal copy of BlackBox project (push requests)

← Older revision		Revision as of 17:21, 21 July 2014
Line 88:		Line 88:
	[[File:Pushdevelopment.png]]		[[File:Pushdevelopment.png]]

	==5. To work with a personal copy of BlackBox project (~~push~~ requests)==		==5. To work with a personal copy of BlackBox project (pull requests)==

	After registration (4.1), and adding ssh-key (4.2, 4.3) you can work with your copy (fork) of Center repository.		After registration (4.1), and adding ssh-key (4.2, 4.3) you can work with your copy (fork) of Center repository.

Ivan denisov: /* 4. To work with BlackBox project (hot editing of Center repository) */

2014-07-11T08:23:35Z

4. To work with BlackBox project (hot editing of Center repository)

← Older revision		Revision as of 08:23, 11 July 2014
Line 64:		Line 64:
	[[File:Gitclone.png]]		[[File:Gitclone.png]]

	4.6 ~~The~~ 'master' branch exists for stable releases, you need to make local 'development' branch with parent 'origin/development'		4.6 Then the precess of cloning will be finished you can make some changes in files, however the 'master' branch exists for stable releases, you need to make local 'development' branch with parent 'origin/development'. Call '''Branch/Create...'''

	[[File:Dev.png]]		[[File:Dev.png]]

	4.7. ~~Then the precess of cloning will be finished you can make some changes in files, however more~~ save way is to make new branch '''Branch/Create...''' for testing new feature or bug fix:		4.7. More save way is to make new one more local branch '''Branch/Create...''' for testing new feature or bug fix:

	[[File:Newbranch.png]]		[[File:Newbranch.png]]

Ivan denisov: /* 4. To work with BlackBox project (hot editing of Center repository) */

2014-07-11T08:21:56Z

4. To work with BlackBox project (hot editing of Center repository)

← Older revision		Revision as of 08:21, 11 July 2014
Line 64:		Line 64:
	[[File:Gitclone.png]]		[[File:Gitclone.png]]

			4.6 The 'master' branch exists for stable releases, you need to make local 'development' branch with parent 'origin/development'

	4.6. Then the precess of cloning will be finished you can make some changes in files, however more save way is to make new branch '''Branch/Create...''' for testing new feature or bug fix:		[[File:Dev.png]]

			4.7. Then the precess of cloning will be finished you can make some changes in files, however more save way is to make new branch '''Branch/Create...''' for testing new feature or bug fix:

	[[File:Newbranch.png]]		[[File:Newbranch.png]]
Line 72:		Line 75:


	4.7. Then you can change the code, test it and commit the results to this temporary branch.		4.8. Then you can change the code, test it and commit the results to this temporary branch.

	[[File:Demofix.png]]		[[File:Demofix.png]]


	4.7. After committing the changes in new branch, you need to merge your change with current state of project. Switch to 'master' branch '''Branch/Checkout...'''. Fetch the updates from 'origin' '''Remote/Fetch from/origin'''. Then you can choose '''Merge/Local merge''', choose the branch to merge, and press Merge button.		4.9. After committing the changes in new branch, you need to merge your change with current state of project. Switch to 'master' branch '''Branch/Checkout...'''. Fetch the updates from 'origin' '''Remote/Fetch from/origin'''. Then you can choose '''Merge/Local merge''', choose the branch to merge, and press Merge button.

	[[File:Merge.png]]		[[File:Merge.png]]

	4.8. Push the 'development' brunch to Center repository		4.10. Push the 'development' brunch to Center repository

	[[File:Pushdevelopment.png]]		[[File:Pushdevelopment.png]]

Ivan denisov: /* 5. To work with a personal copy of BlackBox project (push requests) */

2014-06-30T11:04:39Z

5. To work with a personal copy of BlackBox project (push requests)

← Older revision		Revision as of 11:04, 30 June 2014
Line 97:		Line 97:
	[[File:Forkurl.png]]		[[File:Forkurl.png]]

	5.3 ~~Making~~ pull request.		5.3. Start pull request.

	[[File:Pullrequest.png]]		[[File:Pullrequest.png]]

			5.4. Create pull request.

			[[File:Createpullrequest.png]]

Ivan denisov: /* 5. To work with a personal copy of BlackBox project (push requests) */

2014-06-30T11:02:39Z

5. To work with a personal copy of BlackBox project (push requests)

← Older revision		Revision as of 11:02, 30 June 2014
Line 94:		Line 94:

	5.2. Clone the repository with your repository path and repeat steps 4.6-4.8 for your copy.		5.2. Clone the repository with your repository path and repeat steps 4.6-4.8 for your copy.

			[[File:Forkurl.png]]

	5.3 Making pull request.		5.3 Making pull request.

	[[File:Pullrequest.png]]		[[File:Pullrequest.png]]

Ivan denisov: /* 5. To work with a personal copy of BlackBox project (push requests) */

2014-06-30T11:00:56Z

5. To work with a personal copy of BlackBox project (push requests)

← Older revision		Revision as of 11:00, 30 June 2014
Line 85:		Line 85:
	[[File:Pushdevelopment.png]]		[[File:Pushdevelopment.png]]

	===5. To work with a personal copy of BlackBox project (push requests)===		==5. To work with a personal copy of BlackBox project (push requests)==

			After registration (4.1), and adding ssh-key (4.2, 4.3) you can work with your copy (fork) of Center repository.

			5.1. Making the fork. Go to: https://github.com/BlackBoxCenter/bbcb and push 'Fork' button:

			[[File:Fork.png]]

			5.2. Clone the repository with your repository path and repeat steps 4.6-4.8 for your copy.

			5.3 Making pull request.

			[[File:Pullrequest.png]]

Ivan denisov: /* 3.To make some new project and work with it locally (for experiments and education) */

2014-06-30T10:49:59Z

3.To make some new project and work with it locally (for experiments and education)

← Older revision		Revision as of 10:49, 30 June 2014
Line 9:		Line 9:


	===3.To make some new project and work with it locally (for experiments and education)===		==3.To make some new project and work with it locally (for experiments and education)==

	3.1. Move folder with a project to some place, that does not require administrator rights for creation of new folders and files (for example, home directory or desktop)		3.1. Move folder with a project to some place, that does not require administrator rights for creation of new folders and files (for example, home directory or desktop)
Line 32:		Line 32:

	3.6 Finally you will have the project history ("Git History" in pop-up menu) with the ability to restore any project state or make the new branch for experiments.		3.6 Finally you will have the project history ("Git History" in pop-up menu) with the ability to restore any project state or make the new branch for experiments.



	==4. To work with BlackBox project (hot editing of Center repository)==		==4. To work with BlackBox project (hot editing of Center repository)==

Ivan denisov: /* 4. To work with BlackBox project (hot editing of Center repository) */

2014-06-30T10:49:45Z

4. To work with BlackBox project (hot editing of Center repository)

← Older revision		Revision as of 10:49, 30 June 2014
Line 35:		Line 35:


	===4. To work with BlackBox project (hot editing of Center repository)===		==4. To work with BlackBox project (hot editing of Center repository)==

	4.1. Register at http://github.com and send your login to d.ivan.krsk@gmail.com		4.1. Register at http://github.com and send your login to d.ivan.krsk@gmail.com
Line 86:		Line 86:

	[[File:Pushdevelopment.png]]		[[File:Pushdevelopment.png]]



	===5. To work with a personal copy of BlackBox project (push requests)===		===5. To work with a personal copy of BlackBox project (push requests)===

Ivan denisov at 10:48, 30 June 2014

2014-06-30T10:48:12Z

← Older revision		Revision as of 10:48, 30 June 2014
Line 33:		Line 33:
	3.6 Finally you will have the project history ("Git History" in pop-up menu) with the ability to restore any project state or make the new branch for experiments.		3.6 Finally you will have the project history ("Git History" in pop-up menu) with the ability to restore any project state or make the new branch for experiments.

	===4. To work with ~~existing~~ project (~~with public~~ repository ~~shared with Center members~~)===

			===4. To work with BlackBox project (hot editing of Center repository)===

	4.1. Register at http://github.com and send your login to d.ivan.krsk@gmail.com		4.1. Register at http://github.com and send your login to d.ivan.krsk@gmail.com
Line 84:		Line 86:

	[[File:Pushdevelopment.png]]		[[File:Pushdevelopment.png]]



			===5. To work with a personal copy of BlackBox project (push requests)===

Ivan denisov: /* 4. To work with existing project (with public repository shared with Center members) */

2014-06-30T10:40:23Z

4. To work with existing project (with public repository shared with Center members)

← Older revision		Revision as of 10:40, 30 June 2014
Line 35:		Line 35:
	===4. To work with existing project (with public repository shared with Center members)===		===4. To work with existing project (with public repository shared with Center members)===

	4.1. Register at http://github.com		4.1. Register at http://github.com and send your login to d.ivan.krsk@gmail.com

	4.2. Make ssh-key on your PC.		4.2. Make ssh-key on your PC.
Line 81:		Line 81:
	[[File:Merge.png]]		[[File:Merge.png]]

	4.8. Push to		4.8. Push the 'development' brunch to Center repository

	.~~...~~		[[File:Pushdevelopment.png]]