4

New to working with git in a large scale application. I've used it in personal things, but not at an enterprise scale.

"genius" me: git pull origin {{dev branch name}}
"genius" me: why won't any of these tests work?
"genius" me: spends 2 hours working on fixing some tests

actual genius that I work with: Dude, revert that shit and pull from master, the tests will work. Don't pull from {{dev branch name}} because you have no idead what might be there.

This makes sense. Things are started and abandoned in favor of new priorities all the time. At least my PM is pretty cool and didn't freak out that I wasted that couple of hours like at a previous position.

Also, git is far superior to mstfs. Very smooth and easy to use once you get the hang of it.

Comments
  • 2
    Hopefully some one is fixing those tests in the other branch
  • 1
    You called it a waste of time. Every other developer thinks that you jumped in the code and learned a bit about the code and codestyle.
  • 3
    Just because dev-branch is the working branch doesn’t mean it shouldn’t be trusted. If people are pushing unfinished code into dev-branch then fuck them in public. They should be working in feature branches and only merge into develop when done.
    If dev-branch is untrusted, then what is expected to me merged into release -> master down the line?
  • 3
    Learn git reflog
Add Comment