[Buildroot] MakeFile Error

[hello rabit]

Hello,

I just merged my remote origin with buildroot upstream and after that I am
not able to work with my buildroot project. Please refer the followings:

*Command:* *make O=../<directory> xyz_defconfig*
*Error:*          *Makefile:95: *** missing separator.  Stop.*
                   *make: *** [Makefile:84: _all] Error 2*

*Part of  my Makefile:*











*80 $(MAKECMDGOALS): _all  81         @:  82   83 _all:  84         @umask
$(REQ_UMASK) && \  85                 $(MAKE) -C $(CANONICAL_CURDIR)
--no-print-directory \  86                         $(MAKECMDGOALS)
$(EXTRAMAKEARGS)  87   88 else # umask / $(CURDIR) / $(O)  89   90 # This
is our default rule, so must come first  91 all:*












*92 .PHONY: all  93   94 # Set and export the version string  95 <<<<<<<
HEAD  96 export BR2_VERSION := 2020.08.1  97 # Actual time the release is
cut (for reproducible builds)  98 BR2_VERSION_EPOCH = 1602507000  99
======= 100 export BR2_VERSION := 2021.11-git 101 # Actual time the release
is cut (for reproducible builds) 102 BR2_VERSION_EPOCH = 1630749000 103
>>>>>>> upstream/master*


Furthermore, I tried to register myself with OFTC to access the IRC
channel. But I could not figure out how to register.

I very kindly request you to provide me with the required support (I am not
an expert and still learning) and wish you a great day ahead!

Thanks and Regards.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.buildroot.org/pipermail/buildroot/attachments/20211017/803fbdc4/attachment.html>