You have not concluded your merge (MERGE_HEAD exists)

OK. The problem is your previous pull failed to merge automatically and went to conflict state. And the conflict wasn’t resolved properly before the next pull. Undo the merge and pull again.To undo a merge:git merge –abort [Since git version 1.7.4]git reset –merge [prior git versions] Resolve the conflict. Don’t forget to add and commit the merge. … Read more

C# Java HashMap equivalent

Dictionary is probably the closest. System.Collections.Generic.Dictionary implements the System.Collections.Generic.IDictionary interface (which is similar to Java’s Map interface). Some notable differences that you should be aware of: Adding/Getting items Java’s HashMap has the put and get methods for setting/getting items myMap.put(key, value) MyObject value = myMap.get(key) C#’s Dictionary uses [] indexing for setting/getting items myDictionary[key] = value MyObject value = myDictionary[key] null keys Java’s HashMap allows null keys .NET’s Dictionary throws an ArgumentNullException if you try … Read more

What is $@ in Bash?

I reckon that the handle $@ in a shell script is an array of all arguments given to the script. Is this true? I ask because I normally use search engines to gather information, but I can’t google for $@ and I have grown too accustomed to easily getting served everything.

What is the difference between ‘git pull’ and ‘git fetch’?

In the simplest terms, git pull does a git fetch followed by a git merge. You can do a git fetch at any time to update your remote-tracking branches under refs/remotes/<remote>/. This operation never changes any of your own local branches under refs/heads, and is safe to do without changing your working copy. I have even heard of people running git fetch periodically in a cron … Read more

How do I filter view two columns OR instead of AND?

Click on Column D. On the menu click ‘Data’. Select ‘Create a filter’. Click the filter icon that appeared at the top of Column D. Select ‘Filter by condition’. Click the ‘None’ box and scroll down to ‘Custom formula is’. Select and enter =OR(D:D=”x”,E:E=”x”) in value or formula. Click OK. Alternatively, you can create a new sheet … Read more

PHP – exit or return which is better?

Since you are using exit and return within the global scope (not inside a function), then the behavior is almost the same. The difference in this case will appear if your file is called through include() or require(). exit will terminate the program, while return will take the control back to the calling script (where include or require was called).

default select option as blank

Maybe this will be helpful — select an option — Will be displayed by default. But if you choose an option, you will not be able to select it back. You can also hide it using by adding an empty option <option style=”display:none”> so it won’t show up in the list anymore. Option 2 If you don’t … Read more