Fix Git Merge

[Kagre]

issue #70

[ghost]

@Kagre What is this? I'm trying to fix merge conflicts right now...

[ghost]

Can you please revert this? As you can see, it's generated merge conflicts...

[opbld33]

✅ Validation status: passed

File	Status	Preview URL	Details
Language/Reference/User-Interface-Help/ubound-function.md	✅Succeeded	View

For more details, please refer to the build report.

Note: If you changed an existing file name or deleted a file, broken links in other files to the deleted or renamed file are listed only in the full build report.

[italicize]

@Linda-Editor It's good to see the old corrections being moved to the new repository. I'm sorry my flurry of corrections arrived in the weeks before the move, adding to the work you're handling now.

I'll wait until the old pull requests are moved before I add to the new pull requests. Only 29 left to move, last I looked.

@Kagre I'm eager to make new corrections, but it seems like Microsoft needs another few days to catch up with what we've given them already.

[ghost]

@italicize @Kagre Yes, thank you for waiting to make any more changes. I just spent two days resolving 4000+ merge conflicts from all the activity. I'm running a build to live now, so in the next few hours everything should be back to normal. Also, we're planning to finish up the 29 PRs this week, so if you could wait until next week to contribute updates, you can start with a fresh clone that contains all the updates. Let me know if you have any questions. :-)

[ghost]

@Kagre Also, I incorporated your changes in this PR in my last commit, so that's why we closed it.

[Kagre]

@Linda-Editor @italicize sounds good, I'll hold off till next week to do anything further.

I'm also looking into changing:

From	Into
**Note** Something worth noting	>  **Note** > Something worth noting
**Important** something vital to know	>  **Important** > Something vital to know

[ghost]

@Kagre - That would be great if you could make those changes.

However, these are the OPS styles you should use (please do not use the gifs you mentioned):

Note

This is a note.

Important

This is important.

Warning

This is a warning.

Tip

This is a tip.

Caution

This is a warning

The guidance is here: https://review.docs.microsoft.com/en-us/help/contribute/markdown-extension-snippets?branch=master

One thing to note is that sometimes Notes are in tables, and you can't use this formatting in a table. In a table, please use the following: <br/><br/>**NOTE**:

Thanks for running any global changes you want to make by me first so I can confirm that you're using the accepted OPS styles, etc.

[ghost]

Not everything rendered properly in my note that I just sent, so make sure you review the OPS guidance first to see how it should be formatted: https://review.docs.microsoft.com/en-us/help/contribute/markdown-extension-snippets?branch=master

[Kagre]

@Linda-Editor um, is that link hosted elsewhere? It required me to log in to MS, then told me that I didn't have access once I did...

[ghost]

@Kagre - are you not a Microsoft employee? Just send me your email address, and I'll send you the instructions. Thanks. (v-licapu@microsoft.com)