Changes between Version 1 and Version 2 of ControlSystems/SoftwareTeam/Training/Git

Timestamp:

Oct 23, 2019, 4:37:31 PM (6 years ago)

Author:

Eileen Wang

Comment:

--

ControlSystems/SoftwareTeam/Training/Git

@@ -32 +32 @@
 - git merge -when two or more users make changes at the same time, conflicts will occur. VSC will ask you if you'd like to merge, meaning combining users' codes and having you manually edit any errors.
 
+Example 2:
+1.Go to https://github.com/
+2. Click the plus sign at the top left of the page
+3. Click new repository
+4. Name the Repository HelloWorld
+5. Ignore the Description
+6. Leave it on the public button
+7. Check initialize README.md
+8. Click Create repository
+9. Click on the README.MD file and click the pencil icon to edit.
+10. in the next line, type #hello world
+11. Scroll down to "Commit Changes", type in "added hello" and press Commit changes
+12. Click the clone or download green button and copy the URL
+13. Open up FRC VS Code
+14. In Vs Code, Press: Ctrl + Shift + P (A search bar will pop up)
+15. Type in "Git: clone" and click once it emerges
+16. Paste the URL from the github website and press enter
+17. A tab will appear at the bottom right of the screen. Press "Open Repository"
+18. add a new file named "hello.java" by right-clicking under the README.md on the left
+19. Type in 
+public class hello{
+    public static void main(String args[]) {
+        System.out.println("Hello World");
+    }
+}
+20. Run it to check.
+21. Press: Ctrl + Shift + P (A search bar will pop up)
+22. Type in "Git: Commit"
+23. Two windows will pop up; say Yes to both.
+24. Type in "added hello.java" and press ENTER
+25. Press: Ctrl + Shift + P and type in Git: push.
+25. Check on github to see your changes.
+
 Other terminology:
 - Branches - when you want to focus on different assets in the code, it may be best to create a branch. This way, you won't have to deal with merge conflicts and can commit your changes freely. For example, often in our robot code, we will have a branch devoted to Arm mechanism or Autonomous version. Check the SpaceBase Repository on https://github.com/Team2537/Spacebase and click on the left-most white button "Branch: Main". Explore the other branches what differences or similarities do you see?