Commit 425a34a2 authored by Woude, Auke van der's avatar Woude, Auke van der
Browse files

Update readibility of README

parent e4294d91
......@@ -79,26 +79,28 @@ Example: if you are working on a fork, start at step 0, else, if you are working
====================================================
Some useful GIT commands:
1. Check if you’re on the master branch:
`git branch`
2. If you’re not on the master branch, switch to it:
`git checkout master`
3. Switching to another existing branch:
`git checkout feature-STILT`
4. If you want to compare your code to the master:
`git fetch`
`git status`
5. To get the changes from the remote master:
`git pull`
6. Moving a file:
`git mv stilt/optimizer.py optimizers/optimizer_stilt.py`
7. Committing changes:
`git add .`
`git commit -m “A message” git push`
8. If you want to replace your local master code with the remote master code, follow
these steps (warning! Your previous version will be lost!): git fetch origin
`git reset --hard origin/master`
#### Some useful GIT commands:
1. Check if you’re on the master branch:
`git branch`
2. If you’re not on the master branch, switch to it:
`git checkout master`
3. Switching to another existing branch:
`git checkout feature-STILT`
4. If you want to compare your code to the master:
`git fetch`
`git status`
5. To get the changes from the remote master:
`git pull`
6. Moving a file:
`git mv stilt/optimizer.py optimizers/optimizer_stilt.py`
7. Committing changes:
`git add .`
`git commit -m “A message” git push`
8. If you want to replace your local master code with the remote master code, follow
these steps (warning! Your previous version will be lost!): git fetch origin
`git reset --hard origin/master`
9. Get changes to the master code in your branch:
`git merge origin/master`
#### Experienced CTDAS users, but new to GIT:
Follow the first steps for new users (see below) to get your copy of the current CTDAS code from GIT in a new folder. Then compare the changes in your local code and merge your changes into the new structure (see description above) in your temporary branch. It might happen that you want to create a copy of an existing file on GIT, that you adapt to your project. There is no git cp command, so to create a copy with GIT history, follow these
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment