Published: Apr 9, 2017 Tags: git Category: Engineering Git provides various tools to resolve conflicts during the merge process, and in this blog we only discuss one of them gvimdiff in Windows Operating System. Software installation gvimdiff needs Gvim installed, which is GUI Vi text editor and can be downloaded from: …

Published: Jan 30, 2017 Tags: git Category: Engineering This blog will cover the Git commands which to transfer the changes between branches. If you are not familiar with the basic Git branch commands, you can have a look of my previous blog: git_branch-basic Merge Branch When you have two or more branches, you need to …

Published: Jan 18, 2017 Tags: git Category: Engineering One of the biggest advantage of Git is branching. Git is very strong at handling branches, no matter on functionality or on efficiency. Let's try out the Git branch commands. Create Branch 1git branch f1 The command will create a new branch called f1. Compared to …

Published: Jan 14, 2017 Tags: git Category: Engineering Git has four areas: Working area Index Repository Stash To understand these four areas is essential to learn the git workflow. The following paragraphs will go through these four areas and explain the git workflow. If you are new to git and not familiar with the …

Published: Jan 11, 2017 Tags: git Category: Engineering Git is an open source distributed version control system, which plays important role in current software ecosystem. You may find many GUI Git tools like SourceTree, Github Desktop, TortoiseGit etc, however the best way to learn Git is to deep dive into the Git …