chore: fix v2 links in comments (vuejs#12653) [ci skip]

Author: Jinjiang

src/compiler/codegen/index.ts

@@ -258,8 +258,13 @@ export function genFor(
   ) {
     state.warn(
       `<${el.tag} v-for="${alias} in ${exp}">: component lists rendered with ` +
+<<<<<<< HEAD:src/compiler/codegen/index.ts
         `v-for should have explicit keys. ` +
         `See https://v2.vuejs.org/v2/guide/list.html#key for more info.`,
+=======
+      `v-for should have explicit keys. ` +
+      `See https://v2.vuejs.org/v2/guide/list.html#Maintaining-State for more info.`,
+>>>>>>> chore: fix v2 links in comments (#12653) [ci skip]:src/compiler/codegen/index.js
       el.rawAttrsMap['v-for'],
       true /* tip */
     )

src/core/instance/proxy.ts

@@ -16,20 +16,33 @@ if (__DEV__) {
   const warnNonPresent = (target, key) => {
     warn(
       `Property or method "${key}" is not defined on the instance but ` +
+<<<<<<< HEAD:src/core/instance/proxy.ts
         'referenced during render. Make sure that this property is reactive, ' +
         'either in the data option, or for class-based components, by ' +
         'initializing the property. ' +
         'See: https://v2.vuejs.org/v2/guide/reactivity.html#Declaring-Reactive-Properties.',
+=======
+      'referenced during render. Make sure that this property is reactive, ' +
+      'either in the data option, or for class-based components, by ' +
+      'initializing the property. ' +
+      'See: https://v2.vuejs.org/v2/guide/reactivity.html#Declaring-Reactive-Properties',
+>>>>>>> chore: fix v2 links in comments (#12653) [ci skip]:src/core/instance/proxy.js
       target
     )
   }
 
   const warnReservedPrefix = (target, key) => {
     warn(
       `Property "${key}" must be accessed with "$data.${key}" because ` +
+<<<<<<< HEAD:src/core/instance/proxy.ts
         'properties starting with "$" or "_" are not proxied in the Vue instance to ' +
         'prevent conflicts with Vue internals. ' +
         'See: https://v2.vuejs.org/v2/api/#data',
+=======
+      'properties starting with "$" or "_" are not proxied in the Vue instance to ' +
+      'prevent conflicts with Vue internals. ' +
+      'See: https://v2.vuejs.org/v2/api/#data',
+>>>>>>> chore: fix v2 links in comments (#12653) [ci skip]:src/core/instance/proxy.js
       target
     )
   }

src/core/instance/state.ts

@@ -130,12 +130,20 @@ function initData(vm: Component) {
   data = vm._data = isFunction(data) ? getData(data, vm) : data || {}
   if (!isPlainObject(data)) {
     data = {}
+<<<<<<< HEAD:src/core/instance/state.ts
     __DEV__ &&
       warn(
         'data functions should return an object:\n' +
           'https://v2.vuejs.org/v2/guide/components.html#data-Must-Be-a-Function',
         vm
       )
+=======
+    process.env.NODE_ENV !== 'production' && warn(
+      'data functions should return an object:\n' +
+      'https://v2.vuejs.org/v2/guide/components.html#data-Must-Be-a-Function',
+      vm
+    )
+>>>>>>> chore: fix v2 links in comments (#12653) [ci skip]:src/core/instance/state.js
   }
   // proxy data on instance
   const keys = Object.keys(data)

src/platforms/web/runtime/index.ts

@@ -65,8 +65,13 @@ if (inBrowser) {
       // @ts-expect-error
       console[console.info ? 'info' : 'log'](
         `You are running Vue in development mode.\n` +
+<<<<<<< HEAD:src/platforms/web/runtime/index.ts
           `Make sure to turn on production mode when deploying for production.\n` +
           `See more tips at https://vuejs.org/guide/deployment.html`
+=======
+        `Make sure to turn on production mode when deploying for production.\n` +
+        `See more tips at https://v2.vuejs.org/v2/guide/deployment.html`
+>>>>>>> chore: fix v2 links in comments (#12653) [ci skip]:src/platforms/web/runtime/index.js
       )
     }
   }, 0)