-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathTODO.txt
31 lines (20 loc) · 871 Bytes
/
TODO.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
[X] Equipment put into group should be free
[X] System doesn't remember equipment is free (maybe)
[X] Menu selecion color and menu not enabled colors are white, need to be light grey (see complications)
[X] Headers messed up for tables on sheets
[X] Need to erase backgrounds for banners in page images
[ ] Selection in QTableWidget are not being highlighted
---8<------8<------8<------8<------8<------8<------8<------8<------8<------8<---
GIT workflow
Add changes to git: <-- repeat until feature is working
$ git add <changed files to update>
$ git commit -am "Your message"
$ git push
NOw that it's working merge your changes to dev without a fast-forward
$ git checkout main
$ git merge --no-ff working
Now push the changes to the server
$ git push
And get back to working
$ git checkout working
And you'll see it how you want it.