small remark - there's huge discussion between master-only and feature-branches approach, so I wouldn't be such definite by saying that developer should ALWAYS work with branches. It depends on the situation, as almost everything in our industry ;)
You are right, I will make it more clear that it's a personal opinion (will update after food!). :)
There we go, added a disclaimer at the branches part ;)
Great article :)
I'd add some note about git pull --rebase, it often works more cleanly than normal pull.
git pull --rebase
Also, probably worth mentioning is that git gives a (experienced) developer a lot more tools to fix when something went wrong. This means that if someone screws up it's relatively easy to fix it in git, compared to other VCS (for me that is the main argument for git against any other version control system)
I do like rebase in many cases (even if it might mess up the history a small bit), but I choose to leave it out in this part, as it's a slight bit over the general level of the text, hehe. A good point though!
I use git frequently but it frustrates the hell out of me. It just seems to do random things that no one can explain.
For example, yesterday I merged my code onto our development branch, like I have done hundreds of times before. However, this time the pull request got updated with a whole lot of code from other people's branches - hundreds of files I had never touched. This happens not often, but with some regularity. No one in my team knows why and the only advice given is to copy out your files and start a new branch form scratch.
Right now, too, I am trying to update a local development branch: 'git pull origin dev-branch' but am getting the error Could not read from remote repository. Again, no one knows why. I can access the repo fine on Github and it was working fine yesterday, but today it's not (and is costing me hours of time in debugging).
Could not read from remote repository.
Git just seems way too temperamental to me. Does anyone else have this similar experience?
Have not noticed that type of issues if I don't count the times people have used git commit -a, could it be that your git client changes line endings or "lint fixes" files? Or that you merge/rebase other peoples branches before pushing?
git commit -a
Could not read from remote repository. I get when the repository is down or my net is broken, could that be the issue in your case?
May I recommend Git Immersion and Git Ready?
Nice, good links :)
We're a place where coders share, stay up-to-date and grow their careers.
We strive for transparency and don't collect excess data.