Error version control conflict marker in file

Flags:
    category=core
    severity=wishlist

Site configuration information for perl 5.22.1:

Configured by Red Hat, Inc. at Wed Mar  2 13:26:46 UTC 2016.

Summary of my perl5 (revision 5 version 22 subversion 1) configuration:
   
  Platform:
    osname=linux, osvers=4.3.5-300.fc23.x86_64, archname=x86_64-linux-thread-multi
    uname='linux buildvm-19.phx2.fedoraproject.org 4.3.5-300.fc23.x86_64 #1 smp mon feb 1 03:18:41 utc 2016 x86_64 x86_64 x86_64 gnulinux '
    config_args='-des -Doptimize=none -Dccflags=-O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic -Dldflags=-Wl,-z,relro  -Dccdlflags=-Wl,--enable-new-dtags -Wl,-z,relro  -Dlddlflags=-shared -Wl,-z,relro  -Dshrpdir=/usr/lib64 -DDEBUGGING=-g -Dversion=5.22.1 -Dmyhostname=localhost -Dperladmin=root@localhost -Dcc=gcc -Dcf_by=Red Hat, Inc. -Dprefix=/usr -Dvendorprefix=/usr -Dsiteprefix=/usr/local -Dsitelib=/usr/local/share/perl5 -Dsitearch=/usr/local/lib64/perl5 -Dprivlib=/usr/share/perl5 -Dvendorlib=/usr/share/perl5/vendor_perl -Darchlib=/usr/lib64/perl5 -Dvendorarch=/usr/lib64/perl5/vendor_perl -Darchname=x86_64-linux-thread-multi -Dlibpth=/usr/local/lib64 /lib64 /usr/lib64 -Duseshrplib -Dusethreads -Duseithreads -Dusedtrace=/usr/bin/dtrace -Duselargefiles -Dd_semctl_semun -Di_db -Ui_ndbm -Di_gdbm -Di_shadow -Di_syslog -Dman3ext=3pm -Duseperlio -Dinstallusrbinperl=n -Ubincompat5005 -Uversiononly -Dpager=/usr/bin/less -isr -Dd_gethostent_r_proto -Ud_endhostent_r_proto -Ud_sethostent_r_proto -Ud_endprotoent_r_proto -Ud_setprotoent_r_proto -Ud_endservent_r_proto -Ud_setservent_r_proto -Dscriptdir=/usr/bin -Dusesitecustomize'
    hint=recommended, useposix=true, d_sigaction=define
    useithreads=define, usemultiplicity=define
    use64bitint=define, use64bitall=define, uselongdouble=undef
    usemymalloc=n, bincompat5005=undef
  Compiler:
    cc='gcc', ccflags ='-D_REENTRANT -D_GNU_SOURCE -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches -m64 -mtune=generic -fwrapv -fno-strict-aliasing -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64',
    optimize='  -g',
    cppflags='-D_REENTRANT -D_GNU_SOURCE -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches -m64 -mtune=generic -fwrapv -fno-strict-aliasing -I/usr/local/include'
    ccversion='', gccversion='5.3.1 20151207 (Red Hat 5.3.1-2)', gccosandvers=''
    intsize=4, longsize=8, ptrsize=8, doublesize=8, byteorder=12345678, doublekind=3
    d_longlong=define, longlongsize=8, d_longdbl=define, longdblsize=16, longdblkind=3
    ivtype='long', ivsize=8, nvtype='double', nvsize=8, Off_t='off_t', lseeksize=8
    alignbytes=8, prototype=define
  Linker and Libraries:
    ld='gcc', ldflags ='-Wl,-z,relro  -fstack-protector-strong -L/usr/local/lib'
    libpth=/usr/local/lib64 /lib64 /usr/lib64 /usr/local/lib /usr/lib /lib/../lib64 /usr/lib/../lib64 /lib
    libs=-lpthread -lresolv -lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat
    perllibs=-lpthread -lresolv -lnsl -ldl -lm -lcrypt -lutil -lc
    libc=libc-2.22.so, so=so, useshrplib=true, libperl=libperl.so
    gnulibc_version='2.22'
  Dynamic Linking:
    dlsrc=dl_dlopen.xs, dlext=so, d_dlsymun=undef, ccdlflags='-Wl,--enable-new-dtags -Wl,-z,relro '
    cccdlflags='-fPIC', lddlflags='-shared -Wl,-z,relro  -L/usr/local/lib -fstack-protector-strong'

Locally applied patches:
    Fedora Patch1: Removes date check, Fedora/RHEL specific
    Fedora Patch3: support for libdir64
    Fedora Patch4: use libresolv instead of libbind
    Fedora Patch5: USE_MM_LD_RUN_PATH
    Fedora Patch6: Skip hostname tests, due to builders not being network capable
    Fedora Patch7: Dont run one io test due to random builder failures
    Fedora Patch15: Define SONAME for libperl.so
    Fedora Patch16: Install libperl.so to -Dshrpdir value
    Fedora Patch22: Document Math::BigInt::CalcEmu requires Math::BigInt (CPAN RT#85015)
    Fedora Patch26: Make *DBM_File desctructors thread-safe (RT#61912)
    Fedora Patch27: Make PadlistNAMES() lvalue again (CPAN RT#101063)
    Fedora Patch28: Make magic vtable writable as a work-around for Coro (CPAN RT#101063)
    Fedora Patch29: Fix CVE-2016-2381 (ambiguous environment variables handling)
    Fedora Patch200: Link XS modules to libperl.so with EU::CBuilder on Linux
    Fedora Patch201: Link XS modules to libperl.so with EU::MM on Linux


@INC for perl 5.22.1:
    /usr/local/lib64/perl5
    /usr/local/share/perl5
    /usr/lib64/perl5/vendor_perl
    /usr/share/perl5/vendor_perl
    /usr/lib64/perl5
    /usr/share/perl5
    .


Environment for perl 5.22.1:
    HOME=/home/eda
    LANG=en_GB.UTF-8
    LANGUAGE (unset)
    LC_COLLATE=C
    LC_CTYPE=en_GB.UTF-8
    LC_MESSAGES=en_GB.UTF-8
    LC_MONETARY=en_GB.UTF-8
    LC_NUMERIC=en_GB.UTF-8
    LC_TIME=en_GB.UTF-8
    LD_LIBRARY_PATH (unset)
    LOGDIR (unset)
    PATH=/home/eda/bin:/home/eda/bin:/usr/local/bin:/usr/bin:/sbin:/usr/sbin:/sbin:/usr/sbin
    PERL_BADLANG (unset)
    SHELL=/bin/bash

Please ignore autogenerated disclaimer below this point.

This email is intended only for the person to whom it is addressed and may contain confidential information. Any retransmission, copying, disclosure or other use of, this information by persons other than the intended recipient is prohibited. If you received this email in error, please contact the sender and delete the material. This email is for information only and is not intended as an offer or solicitation for the purchase or sale of any financial instrument. Wadhwani Asset Management LLP is a Limited Liability Partnership registered in England (OC303168) with registered office at 40 Berkeley Square, 3rd Floor, London, W1J 5AL. It is authorised and regulated by the Financial Conduct Authority.

Edit: I somehow got a bad version of the files from GitHub, after re-cloning the git it worked fine.

I am having issues compiling the server. I am running on Ubuntu and even after Rebooting/Updating/Upgrading/Fresh Pull from Git/etc. I am having errors during the build and I’m not sure what I’m doing wrong. Attached is the output from make.

make[1]: Entering directory '/root/rathena/src/map'
        MKDIR   obj
        CXX     achievement.cpp
In file included from achievement.cpp:21:
battle.hpp:714:9: error: invalid digit "8" in octal constant
  714 | >>>>>>> 0828ff00c630d6bcfa7a42826919867f0b8e5250
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from itemdb.hpp:16,
                 from achievement.cpp:25:
status.hpp:95:9: error: invalid digit "8" in octal constant
   95 | >>>>>>> 0828ff00c630d6bcfa7a42826919867f0b8e5250
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
status.hpp:115:9: error: invalid digit "8" in octal constant
  115 | >>>>>>> 0828ff00c630d6bcfa7a42826919867f0b8e5250
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from achievement.cpp:29:
pc.hpp:396:9: error: invalid digit "8" in octal constant
  396 | >>>>>>> 0828ff00c630d6bcfa7a42826919867f0b8e5250
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from achievement.cpp:29:
pc.hpp:1079:9: error: invalid digit "8" in octal constant
 1079 | >>>>>>> 0828ff00c630d6bcfa7a42826919867f0b8e5250
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from achievement.cpp:21:
battle.hpp:692:1: error: version control conflict marker in file
  692 | <<<<<<< HEAD
      | ^~~~~~~
battle.hpp:713:1: error: version control conflict marker in file
  713 | =======
      | ^~~~~~~
In file included from itemdb.hpp:16,
                 from achievement.cpp:25:
status.hpp:92:1: error: version control conflict marker in file
   92 | <<<<<<< HEAD
      | ^~~~~~~
status.hpp:94:1: error: version control conflict marker in file
   94 | =======
      | ^~~~~~~
status.hpp:102:1: error: version control conflict marker in file
  102 | <<<<<<< HEAD
      | ^~~~~~~
status.hpp:109:1: error: version control conflict marker in file
  109 | =======
      | ^~~~~~~
status.hpp:111:30: error: ‘YAML’ does not name a type
  111 |  uint64 parseBodyNode( const YAML::Node& node );
      |                              ^~~~
status.hpp:111:40: error: expected unqualified-id before ‘&’ token
  111 |  uint64 parseBodyNode( const YAML::Node& node );
      |                                        ^
status.hpp:111:40: error: expected ‘)’ before ‘&’ token
  111 |  uint64 parseBodyNode( const YAML::Node& node );
      |                      ~                 ^
      |                                        )
status.hpp:111:40: error: expected ‘;’ at end of member declaration
  111 |  uint64 parseBodyNode( const YAML::Node& node );
      |                                        ^
      |                                         ;
status.hpp:111:42: error: ‘node’ does not name a type
  111 |  uint64 parseBodyNode( const YAML::Node& node );
      |                                          ^~~~
status.hpp:114:39: error: ‘std::shared_ptr<s_refine_level_info> RefineDatabase::findLevelInfo(const item_data&, item&)’ cannot be overloaded with ‘std::shared_ptr<s_refine_level_info> RefineDatabase::findLevelInfo(const item_data&, item&)’
  114 |  std::shared_ptr<s_refine_level_info> findLevelInfo( const struct item_data& data, struct item& item );
      |                                       ^~~~~~~~~~~~~
status.hpp:107:39: note: previous declaration ‘std::shared_ptr<s_refine_level_info> RefineDatabase::findLevelInfo(const item_data&, item&)’
  107 |  std::shared_ptr<s_refine_level_info> findLevelInfo( const struct item_data& data, struct item& item );
      |                                       ^~~~~~~~~~~~~
status.hpp:115:1: error: version control conflict marker in file
  115 | >>>>>>> 0828ff00c630d6bcfa7a42826919867f0b8e5250
      | ^~~~~~~
status.hpp:118:23: error: cannot declare variable ‘refine_db’ to be of abstract type ‘RefineDatabase’
  118 | extern RefineDatabase refine_db;
      |                       ^~~~~~~~~
status.hpp:89:7: note:   because the following virtual functions are pure within ‘RefineDatabase’:
   89 | class RefineDatabase : public TypesafeYamlDatabase<uint16, s_refine_info>{
      |       ^~~~~~~~~~~~~~
In file included from achievement.hpp:15,
                 from achievement.cpp:4:
../common/database.hpp:77:28: note:     ‘virtual const string YamlDatabase::getDefaultLocation()’
   77 |  virtual const std::string getDefaultLocation() = 0;
      |                            ^~~~~~~~~~~~~~~~~~
In file included from achievement.cpp:29:
pc.hpp:390:1: error: version control conflict marker in file
  390 | <<<<<<< HEAD
      | ^~~~~~~
pc.hpp:395:1: error: version control conflict marker in file
  395 | =======
      | ^~~~~~~
In file included from achievement.cpp:29:
pc.hpp:1063:1: error: version control conflict marker in file
 1063 | <<<<<<< HEAD
      | ^~~~~~~
pc.hpp: In function ‘bool pc_cant_act(map_session_data*)’:
pc.hpp:1073:37: error: ‘pc_cant_act2’ was not declared in this scope
 1073 |  return sd->npc_id || sd->chatID || pc_cant_act2( sd );
      |                                     ^~~~~~~~~~~~
pc.hpp:1073:37: note: the macro ‘pc_cant_act2’ had not yet been defined
pc.hpp:1078: note: it was later defined here
 1078 | #define pc_cant_act2(sd)      ( (sd)->state.vending || (sd)->state.buyingstore || ((sd)->sc.opt1 && (sd)->sc.opt1 != OPT1_BURNING) || (sd)->state.trading || (sd)->state.storage_flag || (sd)->state.prevend || (sd)->state.refineui_open )
      |
pc.hpp: At global scope:
pc.hpp:1075:1: error: version control conflict marker in file
 1075 | =======
      | ^~~~~~~
make[1]: *** [Makefile:84: obj/achievement.o] Error 1
make[1]: Leaving directory '/root/rathena/src/map'
make: *** [Makefile:50: map] Error 2

Edited April 21, 2022 by Pyroclese