Useful GIT merge command

-

 

How to merge see below

git merge –no-ff master

How to reset your git changes

git reset HEAD^ --soft (Save your changes, back to last commit)

git reset HEAD^ --hard (Discard changes, back to last commit)

Comments

Post a Comment

Popular posts from this blog

Best PHP comment DockBlock !

-
  Best PHP comment ! Hello developers, Here is my typical php comment/header for each of my php functions. Very useful and pragmatic. They provide a clear indication what the function is doing, inputs, outputs and exceptions. This is the art of coding ! Clear readibility and full transparency on the intentions of the functions. I would definitely make this a requirement for programmer team. Additional work but useful. And if it is an API I would use the zircote/swagger-php library to generate on the fly an amazing swagger documentation /** * Throw Exception If Parameter Is Not Set * * @param object $requestObjectBody * @param int $httpCode * @param string $httpMessage * * @return void * * @throws \Exception $exception * * @author David Raleche < david@raleche.com > * @since 10-09-2020 * @version 10-09-2020 * @internal <ticket-number> */ public static function throwExceptionIfParameterNotSet($param, int $httpCode, string $httpMessage) { if (is_null...
Read more

How to fix pgDump dbeaver ?

-
Image
  DBeaver Configuration : Postgres and MacOs 1 . Install postgres 2. Find path to pg_dump /Applications/Postgres.app/Contents/Versions/latest/bin 3. configure client (Dbeaver) to add hidden files -> command + shift + G paste  /Applications/Postgres.app/Contents/Versions/latest/bin and select the folder 4. Voila !
Read more