Git - comflict solving

Some common usage of git with SourceTree

-> pull to local

pull to local
 - if no conflict -> pull successfully
 - if has conflict 
   option 1. commit to local repo -> stash changes  -> pull
   option 2. prof read 

-> push to remote

If already commit, but don't want to push the code to the remote. :) Simple delete ur local repo, and clone again.

Comments

Post a Comment

Popular posts from this blog

Getting started with OpenShift

Image
OpenShift OpenShift is a container application platform. It is a platform design for the development and deployment of containers. The core technology used as the basis of OpenShift includes Docker-based containers and orchestration via the Kubernets system. Pre-Requisite - Docker and Kubernetes First of all, why we need Containers? That's assuming our application needs some services. One service requires one version of dependencies, while the other service requires another. To achieve compatibility, the architecture of our application needs to be changed over time. Every change we will repeat the tedious process to check the compatibility. :) very annoying. Containers are very similar to a virtual machine, except for they are sharing the same kernel. As shown in the figure below, each Container has their own independent application, libraries and dependencies (For example, in a java project,  .jar files in the build path are t...
Read more