I don’t remember exactly, but the issue is about the existence of a button that makes beginners think a commit and a push are part of the same atomic operation. Not the order of the words on this button
I don’t remember exactly, but the issue is about the existence of a button that makes beginners think a commit and a push are part of the same atomic operation. Not the order of the words on this button
The worst thing about eclipse I’ve had to deal with is its git integration. The conflict resolution tool is awful and half the terminology diverges from plain git.
The fact that it has a “Push & Commit” button also drives me mad far more than it should
As usual, I subscribed for the giggles and I keep getting dragged into unsolicited rabbit holes of useful knowledge. Thanks for being an awesome community
I can think of some “programming best practices” that can help with reducing merge conflicts, such as making small functions/methods, but I see it as a positive side effect.
I don’t think avoiding merge conflicts should be a goal we actively try to reach. Writing readable code organized in atomic commits will already help you get fewer conflicts and will make them easier to resolve.
I’ve seen too many junior and students being distracted from getting their task done because they spent so much time “coordinating” on order to avoid these “scary” merge conflicts
That was the point of my comment, unless they wrote this ironically.
Sorry you went through the trouble of writing all of this explanation, I hope this is useful to someone else
How do you avoid conflicts happening in the first place?
Might as well use Google drive… Or maybe actually learn to use git? The learning curve is steep but it’s worth investing in it
I totally agree with w3schools being bad. However, when teaching web dev to beginner students, they usually find the MDN hard to understand and turn to w3schools.
The MDN requires either quite a lot of experience reading documentation, or being shown how to navigate it.
I prefer the CLI as well, but when I’m not a dev I supervise practical works in programming classes, where I don’t have much saying in the recommended/required tools