-
Notifications
You must be signed in to change notification settings - Fork 3
/
Copy pathgitcommands.txt
45 lines (35 loc) · 1.26 KB
/
gitcommands.txt
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
Compiling and running
javac --module-path ./jfx/lib --add-modules javafx.controls Kettlelog.java
java --module-path ./jfx/lib --add-modules javafx.controls Kettlelog
find . -type f -iname \*.class -delete
PUSHING LOCAL CHANGES TO MASTER
To be safe, update your local master to be exactly the same as the remote one.
git checkout master
git fetch --all
git reset --hard origin/master
If you're happy with your local branch:
git checkout name-branch
git add .
git commit -m "message"
git push origin name-branch
Now, the git remote branch is updated with your local branch.
Next, push to master.
git checkout master
git pull origin master
git merge name-branch
git push origin master
Now, check the status of your branch.
git checkout name-branch
git status
Continue working!
PULLING CHANGES FORM MASTER TO LOCAL BRANCH
To completely replace your local branch (ONLY IF YOU HAVE NOTHING ON YOUR LOCAL)
git checkout name-branch
git fetch --all
git reset --hard origin/master
If you have work on your local,
commit to your own branch
pull master
fix merge conflicts
https://stackoverflow.com/questions/1022880/accessing-a-variable-from-another-class
https://github.com/goxr3plus/XR3Player/tree/master/src/main/java/com/goxr3plus/xr3player