Software Engineering – Ryan Chapin's Website

How to partially cherry-pick a commit in git

Posted on October 12, 2024 by rchapin

There are times when you need to cherry-pick a commit from another branch. Then there are times when you only need parts of that commit.

Following is how you can partly cherry-pick a commit to get only the changes that you need.

Get the patch for the entire commit. Include the -n for no commit so that it does not add it as a commit to your branch

git cherry-pick -n <commit

Then unstage the the changes from the cherry-picked → Continue reading “How to partially cherry-pick a commit in git”

Earthly Cheat Sheet

Posted on June 5, 2023 by rchapin

I have just recently started using Earthly and the following is a list of commands that I want to keep track of

Caching

Completely clearing the cache: Earthly stores artifacts in docker volumes. If you want to completely flush that data and start fresh run the following

docker stop earthly-buildkitd && \
docker rm earthly-buildkitd && \
docker volume rm earthly-cache

→ Continue reading

Git Merge Conflict Resolution Cheat Sheet

Posted on March 13, 2023March 14, 2023 by rchapin

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.

–ours vs –theirs

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”