git: useful commands

-- Undo a Git merge that hasn't been pushed yet

git reset --hard HEAD~1

 It will get you back 1 commit.
Any modified and uncommitted/unstashed files will be reset to their unmodified state
Location: Pune, Maharashtra, India

Comments

Post a Comment

Popular posts from this blog

map struct :- Caused by: org.apache.maven.plugin.compiler.CompilationFailureException: Compilation failure

Some times while integrating map-struct with spring boot/swagger we will get below exception:- [ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:compile (default-compile) on project : Compilation failure [ERROR]  Couldn't retrieve @Mapper annotation Solution:- You don't need to exclude the entire swagger for this. You can do this to only exclude the Mapstruct dependency that swagger2 brings with itself: < dependency > < groupId >io.springfox</ groupId > < artifactId >springfox-swagger2</ artifactId > < version >${swagger2.version}</ version > < exclusions > < exclusion > < groupId >org.mapstruct</ groupId > < artifactId >mapstruct</ artifactId > </ exclusion > </ exclusions > </ dependency >
Read more

How to reset to previous commit.

Sometimes you may face situation where you need to take older commits and push it to repo. For this we can do below steps:- 1.) git reset --hard <commit_hash> 2.) git push origin <branch_name> --force Key here is forcing the push, no extra commits/commit messages etc
Read more

Running docker as non-root user

To create the  docker  group and add your user: Create the  docker  group. sudo groupadd docker Add your user to the  docker  group. sudo usermod -aG docker $USER L og out and log back in so that your group membership is re-evaluated. If testing on a virtual machine, it may be necessary to restart the virtual machine for changes to take effect. On a desktop Linux environment such as X Windows, log out of your session completely and then log back in. Verify that you can run  docker  commands without  sudo . docker run hello-world Reference:- https://docs.docker.com/engine/installation/linux/linux-postinstall/#next-steps
Read more