Tag Archives: git

Git Auto-Pull Broken, Fix Found

At my work, we have a Git auto-pull script set up for development branches, so that whenever a developer pushes a commit, the development server will automatically pull in those changes. ┬áHere is a basic example of that sort of … Continue reading

Posted in Code Snippets, Tools, Web Design Tagged , , , ,

How to Correctly Revert a Bad Merge in Git

Let’s say we have this situation: –o—o—o—M—x—x master / –A—B my-dev-branch A and B are on development branch “my-dev-branch,” which actually had some bugs in it. M is the merge that brings these premature changes into master, x are changes … Continue reading

Posted in Tools Tagged , ,