Fix beachball npm publish pipeline (#296)

* Update scripts to publish react-native-macos-init

* Fix beachball publish by using a template to set the git user.email and user.name

* Manually set the package version to what the beachball publish step tried and failed to commit.

* Clean up merge markers

Author: tom-un

.ado/publish.yml

@@ -63,6 +63,8 @@ jobs:
         submodules: recursive # set to 'true' for a single level of submodules or 'recursive' to get submodules of submodules
         persistCredentials: true # set to 'true' to leave the OAuth token in the Git config after the initial fetch
 
+      - template: templates/configure-git.yml
+
       - task: CmdLine@2
         displayName: yarn install
         inputs:

.ado/templates/configure-git.yml

@@ -0,0 +1,9 @@
+
+steps:
+
+  - task: CmdLine@2
+    displayName: Configure git
+    inputs:
+      script: |
+        git config --global user.email "[email protected]"
+        git config --global user.name "React-Native Bot"

packages/react-native-macos-init/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-macos-init",
-  "version": "0.0.0",
+  "version": "1.0.0",
   "description": "CLI to add react-native-macos to an existing react-native project",
   "main": "index.js",
   "repository": "https://github.com/microsoft/react-native-macos",