GIT QNA

-

 --_________--___-_________-------___--_


1) Warning!

--_________--___-_________-------___--_

$ git add index.html

warning: LF will be replaced by CRLF in index.html.

The file will have its original line endings in your working directory



Solution :

git config core.autocrlf true

2.  
Whille trying and merge the new branch to master error is :
fatal: refusing to merge unrelated histories



--_________--___-_________-------___--_
Solution :
--_________--___-_________-------___--_

The error is resolved by toggling the allow-unrelated-histories switch. After a git pull or git merge command, add the following tag:
git pull origin master --allow-unrelated-histories

Comments

Post a Comment

Popular posts from this blog

Git Commands With Output Log

-
Step by step command only Guide where command starts with symbol $ ----------------------------- git config -- global user . name "your username"   git config -- global user . password "your password" Track file : This means the file is added to the git repository in your local machine. Also called added to the stage area. Untracked File : Code is still in your local folder not added to git repository ----------------------------------------------- Commands --------------------------- checking current working directory  rssan@DESKTOP-QA9A7TD MINGW64 ~ $ pwd /c/Users/rssan creating a new directory rssan@DESKTOP-QA9A7TD MINGW64 ~ $ mkdir test getting inside that newly created directory rssan@DESKTOP-QA9A7TD MINGW64 ~ $ cd test creating a new directory inside for git repository rssan@DESKTOP-QA9A7TD MINGW64 ~/test $ mkdir repo getting inside the newly created repo directory rssan@DESKTOP-QA9A7TD MINGW64 ~/test $ cd repo/ Again created a mygitrepo directory inside rss...
Read more

Java Interview Preparation (conceptual)

-
Image
 All Concepts sumerized .... ------------------------------------------------------------- *** Java is partially Object-oriented as it has primitive types. (Primitive i.e. int, float are not the objects, to convert them to use as Object, we use wrapper class) ***Java is platform-independent but JVM dependent. And JVM is platform dependent because for Linux there is a different JVM whereas for windows it's different. _-_____-----___--___--____--- Oo ps Conc ept  _-_____-----___--___--____--- abstraction ,  encapsulation ,  inheritance ,  polymorphism .  Inheritance : Real-World Example : Children have some of the qualities of their parents and grandparents or their ancestors. Java Example: There is a method in the parent class and you want the same method to create in a child class. Why create a new one if it already exists. As a child, you can inherit the method. There are a few variables in a class and you need them .So why to create new variables. We can ...
Read more

Java 8 Function Interface

-
Java.Util.Function ------------------------ Java.Util.Function added in java 8. So let's have a closer look into it. To go through the documentation click the below link. https://docs.oracle.com/javase/8/docs/api/java/util/function/package-summary.html The 4 important topics are , 1. Predicate 2. Consumer   3. Function 4. Supplier A youtube example for better understanding is :  https://www.youtube.com/watch?v=Tapz6_T5oHY Consumer :  --  two methods, accept(T t) and andThen() ** accept(T t) , returns void means no thing returned. It accepts only input. **andThen executes two consumers one after another. #java #java8 #java 8 #java.util.function #javaFunction #java function #java consumer #java predicate #java supplier #java lambda expression
Read more