Timeline for How should we set up our git structure?
Current License: CC BY-SA 4.0
6 events
| when toggle format | what | by | license | comment | |
|---|---|---|---|---|---|
| Nov 10, 2023 at 14:50 | vote | accept | 1082 X | ||
| Nov 10, 2023 at 8:50 | comment | added | pjc50 | Given the context: (a) spend less time fiddling with tooling and workflow and get on with programming the robot; (b) try the approach of "merge main to personal" rather than rebase. | |
| Nov 9, 2023 at 23:53 | comment | added | 1082 X | Also for context, please see my first two comments on J_H's post. | |
| Nov 9, 2023 at 23:52 | comment | added | 1082 X | However, if we switch to feature branches instead of "personal" branches that might be different? idk | |
| Nov 9, 2023 at 23:52 | comment | added | 1082 X | Removing the remote personals is not totally an option, because in our case it is often (especially when merge conflicts arise) that the programmer making the commits shouldn't be the one to merge into main. | |
| Nov 9, 2023 at 16:09 | history | answered | pjc50 | CC BY-SA 4.0 |