This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision Next revision | Previous revision | ||
|
version_control [2013/06/03 07:07] sandeep |
version_control [2018/03/24 11:13] (current) |
||
|---|---|---|---|
| Line 14: | Line 14: | ||
| - cd git | - cd git | ||
| - Clone the repository to your local machine | - Clone the repository to your local machine | ||
| - | - git clone [email protected]:/home/git/camp/team$ team$ ($ represents team no.) | + | - git clone [email protected]:/home/git/camp/team$ team$ ($ represents team no.) |
| - Change the directory to team$ | - Change the directory to team$ | ||
| - cd team$ | - cd team$ | ||
| Line 92: | Line 92: | ||
| - git merge 'branchname' | - git merge 'branchname' | ||
| - | |||
| and then use commit command to finalise the changes. | and then use commit command to finalise the changes. | ||
| + | |||
| + | |||
| - Merge Commands : | - Merge Commands : | ||