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

Spring container and sequential steps

-
package com.mgt.springdemo; import org.springframework.context.support.ClassPathXmlApplicationContext; public class SpringApp { public static void main(String[] args) { // load the spring configuration file ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("applicationContext.xml"); // retrieve bean from spring container Book b= context.getBean("myBook", Book.class); // call methods on the bean System.out.println(b.getBookDetail()); // close the context context.close(); } }
Read more

NumPy Codes and import

-
Image
 First open Anaconda, then launch the jupyter notebook. Then create new python 3 file. Here we will discuss NumPy arrays and codes. Let's print an array. Oh ! Was it easy ? Yes .It was. Now we will import numpy and use that to assign the array to a variable, and some other things also will try ... Here, I created an array . Then I imported NumPy as np . Then I used np to set the array to the variable arr. 2D array NumPy There are 2 braces in the beginning so 2D array.3 rows 3 columns. arrange is used to quickly generate an array in NumPy of certain condition or in normal as per above example. link space --------------: here the third argument is considered as no of points as you want where as arrange take it as steps as you want. identity matrix randn() shows a standard normal distribution. randn() in 2  Dimension Printing random integer using randint() max() for finding the highest number in the array and min() for the lowest number. argmax() used to show the index of the max...
Read more