Solve Line encoding(unix/windows) problems in Git branches through Eclipse

There are some possibilities when people work on the same Git hub project in unix and windows. During this time most of us face the problem with Line encoding, Even though there are no changes to the branch, we will observe the entire file has been changed. This is so cumbersome to look at each and individual file and check what actual content is modified.

There are 2 fixes fir this;

• Fix the IDE settings for file encoding and line delimiters
• Configure Git to automatically do the conversion for you

Auto Merging of Git Branches through Jenkins

Two Git branches can be merged and pushed to remote as a part of the build process. This is possible with Jenkins Git plugin with just 2-3 steps configuration. Lets see that in detail.

• Create/configure a job in Jenkins
• In Source code management configure the git repository and the integration branch.
• While merging Test4 branch into Test3 branch; integration branch is Test4 and the Branch to merge to is Test3