3 ms·
I think a lot of the git problems come along due to 'good ideas'. Basic git isn't too bad. A learning curve, but manageable. However, next thing you know you'
by mobiuscog 3y ago
I think a lot of the git problems come along due to 'good ideas'.
Basic git isn't too bad. A learning curve, but manageable.
However, next thing you know you're in a sprint and your work depends on somebody else's (process problem, but happens often) and so you are now working on top of their branch.
You make some commits, and have to merge in (or rebase - force push) their changes...
... and then you come in to work after the weekend and find that they have merged their code into main. Cool ! You'll just merge/rebase main, except you find that they had also been working on top of someone else's branch, and now you have all sorts of fun trying to unpick how your changes actually relate to what is in main.
Sure, some people are just happy to rebase and force-push, but if you're happy to force-push then the 'control' has gone.