Principal Software Engineer/Architect, motorcyclist, drummer, and artist
A handful of handy git commands that I don’t use all that often but want to keep track of:
git stash push -m 'message here' -- path/to/fileFirst figure out the id of the stash you want to drop with git stash list, then issue the following command
git stash drop stash@{n}
If you need to change the author of a commit → Continue reading “git Cheat Sheet”
Some of git’s nomenclature can be confusing, especially since it is context dependent. Following are some TLDR;s for dealing with resolving merge conflicts in different scenarios.
The meaning of --ours vs --theirs can depend on whether you are doing a rebase or a merge.
Assuming that the feature branch is checked out
git merge develop | git rebase develop | |
To keep changes from develop | --theirs | --ours |
To keep changes from feature | --ours | --theirs |
If, during a rebase there → Continue reading “Git Merge Conflict Resolution Cheat Sheet”
This is a common error encountered where you are renaming your default branch for the repository. If you have a repo hosted on GitHub or some other third-party service, there is likely some way in the GUI to change the default branch for a repo.
If you are hosting your own internal git repository you will need to SSH to that server and “checkout” a different branch from the one that you are trying to delete. In reality, the remote → Continue reading “[SOLVED] Deleting remote git branch; By default, deleting the current branch is denied, because the next remote: ‘git clone’ won’t result in any file checked out, causing confusion”