Java and Eclipse Plugin Development

When looking at git  conflict markers it can sometimes be confusing which half of the conflicting section belongs to which branch: <<...

 $ git checkout pull_request_branch  $ git rebase -i HEAD~n //n is the number of commits you would like to see during rebase or you could s...

So far I was mostly using the past tense since it looks natural to me but the git best practices suggest us to use imperative sentence. E...

I always like to improve the development process with the git and a strong believer in the clean code. Something which I always insist d...

First, let me check my branch and the origin item-ax40113:es6features kkolipaka$ git branch * master item-ax40113:es6features k...

Usually, when you are pushing like git push origin master , your remote branch name and local branch is same i.e, master But if you...

Here is my scenario - I've development and release branches. And I want to merge my changes from development to release branch and if a...

For a better code reviewability, don't combine refactoring changes and fix changes into a single commit. If it's a very small ref...

$ git fsck --cache --unreachable $(git for-each-ref --format="%(objectname)")   $(egrep commit all | cut -d ' ' -f 3) ...

If you're merging local commits: http://exploreeclipse.blogspot.sg/2012/11/git-squash-all-commits-into-single.html If the code i...

Here is the case: I pushed multiple bad commits into a central repository and now I wanted to roll back all of them. Step1 : check g...

$ git checkout development $ git merge -s ours release  //merge release into development and discard any changes on release branch $ g...

Step 1: Identify the head commit of the branch till where you wanted to undo it. $ git reflog 5621e87 HEAD@{0}: checkout: moving from...

Here is the example. $ git remote -v origin  https://github.com/kolipakakondal/titanium_studio.git (fetch) origin  https://github.com/k...

But, why ? Your pull request(PR) might be pretty old and in mean time many people would have changed the same code. So you can't s...

For example, If new branch is added to the repository and now you wanted to setup that in your local system. $ git fetch This will look...

Let's take a scenario: This is the remote repository: https://github.com/apache/mystudio.git Your forked repository from the abo...

> git remote add coworker https://github.com/coworker/studiorepo.git > git fetch coworker > git checkout --track coworker/foo ...

Some practices which I follow for naming git branches. If you are working on sprint/agile development, you might have planned certain act...

Run below command to avoid the issue. $ git config core.longpaths true