github revert commit似乎已经破坏了我的项目

问题描述

我是React的新手。基本上，我创建了一个无法解决的错误，因此我恢复为旧的提交。现在，它改变了我的整个应用程序，而不是像平常一样还原。例如，其中一个组件现在看起来像这样，到处都是<<<<<<<<<<HEAD。
我无法进行任何更改，无法运行应用程序，并且无法编译。请帮忙。

编辑：请注意，我使用了桌面git control应用程序，而不是终端。我不知道这是否重要。

import React from 'react';
import './Welcome.css'
import Filteritem from '../FilterItem/FilterItem';
import recipes from '../data/recipes.json'


const Nrec = () => {
    let newRecipe = recipes.filter(recipe => {
        return recipe.id === (recipes.length) 
    }) 
    console.log(newRecipe[0])
    return (
        <div className="welcome__new-description-new-rec container-fluid">
                <div className=" welcome__new-menu-Box-outer">
                        <div className="welcome__new-menu-Box-inner">
                            <img src={newRecipe[0].image} alt="mains" className="welcome__new-menu-Box-img"/>
                            <div className="welcome__new-menu-name-wrap">
                                <h3 className="welcome__new-menu-Box-img-text2 font">Newest Recipe:</h3>
                                <h3 className="welcome__new-menu-Box-img-text font">{newRecipe[0].name}</h3>
                            </div>
                        </div>
                </div>
            </div>
      );
    }

const Welcome = () => {

    const filters = [
        {
            id: 1,name : "Mains",image: "https://images.pexels.com/photos/2116094/pexels-photo-2116094.jpeg?auto=compress&cs=tinysrgb&dpr=1&w=500",filter: "main"
        },{
            id: 2,name : "Sides",image: "https://images.pexels.com/photos/262978/pexels-photo-262978.jpeg?auto=compress&cs=tinysrgb&dpr=1&w=500",filter: "side"
        },{
            id: 3,name: "Desserts",image: "https://images.pexels.com/photos/45202/brownie-dessert-cake-sweet-45202.jpeg?auto=compress&cs=tinysrgb&dpr=1&w=500",filter: "dessert"
        },{
            id: 4,name: "Starters",image: "https://images.pexels.com/photos/4173178/pexels-photo-4173178.jpeg?auto=compress&cs=tinysrgb&dpr=1&w=500",filter: "starter"
        },{
            id: 5,name: "Cakes",image : "https://images.pexels.com/photos/1120970/pexels-photo-1120970.jpeg?auto=compress&cs=tinysrgb&dpr=1&w=500",filter: "cake"
        }]
    
    return ( 
        <div className="welcome">
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
            <div className="padder"></div>
            <div className="container-fluid text-left welcome__title-Box">
                <h2 className="welcome__title font">Welcome.</h2>
                <p className="welcome__description font"> Select a menu below</p>
=======
            <div className="container-fluid text-left welcome__title-Box pl-0">
                <h2 className="welcome__title font mt-2">Welcome.</h2>
                <p className="welcome__description"> Please select a menu below</p>
>>>>>>> parent of 745e6ca4... update
=======
            <div className="container-fluid text-left welcome__title-Box pl-0">
                <h2 className="welcome__title font mt-2">Welcome.</h2>
                <p className="welcome__description"> Please select a menu below</p>
>>>>>>> parent of 745e6ca4... update
=======
            <div className="container-fluid text-left welcome__title-Box pl-0">
                <h2 className="welcome__title font mt-2">Welcome.</h2>
                <p className="welcome__description"> Please select a menu below</p>
>>>>>>> parent of 745e6ca4... update
            </div>
            <div className="welcome__menu-Box">
                {filters.map((filter) => <Filteritem key={filter.id} filter={filter} />)}
            </div>
            <div className="padder"></div>
            <div className="d-flex">
            <div className="welcome__new-rec">
                {Nrec()}
            </div>
            <div className="container-fluid welcome__title-Box-bottom mt-5 pr-0">
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
                <h3 className="welcome__description-bottom-header font">All recipes</h3>
                <p className="welcome__description-bottom font">are sourced by Grandma from all over the net,editted and perfected by her expert touch.</p>
            </div>
=======
                <p className="welcome__description-bottom mb-0">All recipes are sourced by Grandma from all over the net,editted and perfected by her expert touch.</p>
>>>>>>> parent of 745e6ca4... update
=======
                <p className="welcome__description-bottom mb-0">All recipes are sourced by Grandma from all over the net,editted and perfected by her expert touch.</p>
>>>>>>> parent of 745e6ca4... update
            </div>
            
            
        </div>
     );
}
 
export default Welcome;

解决方法

暂无找到可以解决该程序问题的有效方法，小编努力寻找整理中！

如果你已经找到好的解决方法，欢迎将解决方案带上本链接一起发送给小编。

小编邮箱:dio#foxmail.com (将#修改为@）