Skip to main content

Git --CheetSheet=3

Rebase Plot:
 
There is brach named "kennel", this needs to be merged on to master without merge conflicts. So go to branch "kennel" and rebase "master" on it. Then go to "master" and merge "kennel" into "master".

Strategy :

1.git checkout kennel

2.git rebase master

3.git checkout master


________________________________________________________________________________

For no merge conflicts :

1. git fetch #retrieve changes from remote without merging into current branch.

2. git rebase #put the fetched remote commits beneath the present commits.

4.git merge kennel


_______________________________________________________________________________

History

1. git log --pretty=oneline
2. git diff
3. git diff master elephant #compare one brachn with another.
4. git diff HEAD~2 HEAD
5. git log -p
6. git blame <file_name>

_______________________________________________________________________________

7. git config user.email "admin@example.com  %local repo config

8. git config alias.commitasli commit

Labels:

Comments

Post a Comment

Popular posts from this blog

Event Sourcing with CQRS.

  The way event sourcing works with CQRS is to have  part of the application that models updates as writes to an event log or Kafka topic . This is paired with an event handler that subscribes to the Kafka topic, transforms the event (as required) and writes the materialized view to a read store.
Post a Comment
Read more

GraphQL microservices (GQLMS)

I'm curios of GraphQL !     -  GraphQL is an open-source data query and manipulation language for APIs, and a runtime for fulfilling queries with existing data. GraphQL was developed internally by Facebook in 2012 before being publicly released in 2015. It should be solving a problem in querying data !     -GraphQL lets you ask for what you want in a single query, saving bandwidth and reducing waterfall requests. It also enables clients to request their own unique data specifications. A case study ?!    -https://netflixtechblog.com/beyond-rest-1b76f7c20ef6 So, This is just another database technoloy ?  -  No. GraphQL is often confused with being a database technology. This is a misconception, GraphQL is a   query language   for APIs - not databases. In that sense it’s database agnostic and can be used with any kind of database or even no database at all. Source:   howtographql.com    
Post a Comment
Read more