|
And nobody wants to use a submodule? Is repoA going to change much in ways repoB either does or doesn't want? ie, do you want to let folks check repoA out on its own?
|
#
¿
Jan 27, 2023 03:41
|
|
|
|
| # ¿ May 13, 2024 22:17 |
|
|
TheBlackVegetable posted:Just started a new job, first week in. Cloned a repo and saw two developers committing to main - one with frequent, poorly worded commits, the other one having pulled, merged and discarded the other devs changes and pushed back up. Maybe they have a separate "developed" branch that they merge into when they are ready to release the code they've developed? If everyone is a senior dev and depending on how the code is used, you can maybe get away with requiring PRs but not requiring approvals.
|
|
#
¿
Jun 4, 2023 14:48
|
|
|
I may be wrong but rebasing dev seems particularly dangerous. My recollection is rebasing is poo poo if you have a lot of branches or the code has been pulled to multiple locations. Pre rebase, most branches see the code as code:
|
|
#
¿
Oct 7, 2023 15:34
|
|
|
Yeah, you're right, now I remember. Doing it on your own branch is generally fine, but one time I had pulled someone else's feature branch so I could help them out, and when they rebased it ended up meaning I couldn't just pull in the branch I ended up needing to blow up some stuff and start over. I think the rule we settled on is just don't rebase if your mydev branch has been pushed or branched off of.
|
|
#
¿
Oct 7, 2023 16:55
|
|
|
Maigius posted:I still see the branch name, I was in the middle of a merge with a bunch of conflicts when I hit the disconnect option. It sounds like the Git part is fine, but Eclipse has set itself to ignore Git or forgot how to access git. Hope that tells you where to start looking. The git info is all stored in .git which is in the project directory, there isn't much subtle going on there, and it sounds like .git is fine or the command line would be giving you issues.
|
|
#
¿
Oct 11, 2023 16:28
|
|