如何解决合并git时这些行是什么?
我是合并git的新手
<<<<<<< HEAD
import React,{ PureComponent } from 'react';
import '../styles/components/Outline.scss';
=======
import React,{ useEffect,useRef } from 'react';
>>>>>>> master
import Button from '@material-ui/core/Button';
import Step from '@material-ui/core/Step';
import { createStyles,withStyles } from '@material-ui/core/styles';
import StepContent from '@material-ui/core/StepContent';
import StepLabel from '@material-ui/core/StepLabel';
import Stepper from '@material-ui/core/Stepper';
import CheckCircle from '@material-ui/icons/CheckCircle';
import Lock from '@material-ui/icons/Lock';
import LockOpenIcon from '@material-ui/icons/LockOpen';
<<<<<<< HEAD
import AuthenticationDialog from './shared/AuthenticationDialog';
import firebase from '../firebase';
import { Event } from '../models/analytics';
import { LessonOutlineData,LessonOutlineItemData } from '../models/data';
import { toY } from '../util/scroll';
=======
import { DrawerScrollRequest } from '../models/state';
import '../styles/components/Outline.scss';
import { computeScrollYIntoView } from '../util/scroll';
如您所见,我正在尝试将master合并到一个分支中。 但是我不知道这些行在说什么
版权声明:本文内容由互联网用户自发贡献,该文观点与技术仅代表作者本人。本站仅提供信息存储空间服务,不拥有所有权,不承担相关法律责任。如发现本站有涉嫌侵权/违法违规的内容, 请发送邮件至 dio@foxmail.com 举报,一经查实,本站将立刻删除。