I'm a staff software engineer at Bonusly and MCS and BS Computer Science graduate from Arizona State University. I previously worked at Gusto, General Motors, and Sandia National Labs.
Please check out my resume and the projects I’ve created. My GitHub profile is jibarra. I cover my development interests and different hobbies on my blog.
I wrote this piece as a part of a weekly project update email at Bonusly. I wanted to give non-technical folks an understanding of why changes can take a long time to implement and why we sometimes need to do refactors. I iterated on it a bit to come to the correct metaphor, starting at the metaphor that our system is a “tangled mess of spaghetti” and ending at this version.
Today I learned about the Git --force-with-lease command.
I’ll restate a description of the command but it allows you to rebase and force push with less risks than using --force. If you had pushed your changes up to a remote branch and somebody else had pushed up new changes to that remote branch while you’re rebasing. After you finish rebasing, a normal git push will fail because the local refs don’t match the remote ones. Usually people will git push --force at this point because they were just rebasing their branch. However, this would wipe away commits on the remote branch. This is easy to do if you’re working on a branch and don’t realize that somebody else had commit to it.