If we want to find the newest commit that is in our main and in our feature branch, we can use this Git command:
|
1 |
git merge-base feature main |
1fe43981b856bkk8958494949494949494493339 This gives us the hash of the commit that is in both branches (in my example 1f439***). We can then see the details of that commit with git log: …
Last week I was in Oslo to attend the NDC conference. I cannot really believe that this was already the 10th NDC Oslo I attended. With 2’600 attendees it was the biggest NDC event ever, but at least for me not the best. Practical Clean Architecture workshop with Jason Taylor I started my NDC …
Oh My Posh is a great extension to show a useful Git prompt in your terminal. It actually works on Windows, even if we need some extra steps to turn this prompt into this Installation We can use the official installation guide an install Oh My Posh from the Windows Store: This installer gets …
Does this situation sound familiar? You start with a simple change and after a few commits you notice that the change is a lot bigger than expected. It will be so big that the code better has its own feature branch. But how do we get our commits from the main branch to a new …
If something goes wrong with the permissions of your Git repository, you may end up with an error like this:
|
1 |
git status |
fatal: detected dubious ownership in repository at ‘C:/my/Repo’ To add an exception for this directory, call: git config –global –add safe.directory C:/my/Repo Set the environment variable GIT_TEST_DEBUG_UNSAFE_DIRECTORIES=true and run again for more information. If …
As I was working on a project, GitHub Desktop bombarded me with this login dialog: The user it showed made no sense and I could push my local commits to the remote repository for the project I worked on. What was wrong with this Git client? Should this happen to you, click on Help / …
If your Git client does not clean-up the local branches after those branches got deleted in your remote repository, you can run this command to get rid of them:
|
1 |
git remote prune origin |
This remote prune command deletes everything under the origin path if it no longer exists on the remote server. That makes it a helpful command …
While refactoring the folder structure of a project I run into something strange. Git suddenly stopped to track a few files and marked them as deleted. That was not my intention then those files are needed. How can we fix this? The direct approach The not working approach was this: Open the project in …
Sooner or later we all run into this situation with Git: We committed a change that should not be committed and we only found that out after we hit commit in out IDE. If we did not yet push this change to our centralised repository, we can use this command to undo our mistake:
|
1 |
git reset --soft HEAD^ |
…
GitHub provides a simple issue tracker with a minimalist user interface. While this minimalism is often an advantage, it does not help the user report the important details to reproduce a bug: As a result, you get a lot of issues where you need to ask the same questions all over again: What version do …