Skip to content

Commit bb0b8d0

Browse files
author
Colin Robertson
committed
Fix merge conflicts.
2 parents f71112e + f1d8ef0 commit bb0b8d0

3,302 files changed

Lines changed: 119957 additions & 138366 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitattributes‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
###############################################################################
2+
# Set default behavior to automatically normalize line endings.
3+
###############################################################################
4+
* text=auto
5+
6+
###############################################################################
7+
# Set default behavior for command prompt diff.
8+
#
9+
# This is need for earlier builds of msysgit that does not have it on by
10+
# default for csharp files.
11+
# Note: This is only used by command line
12+
###############################################################################
13+
#*.cs diff=csharp
14+
15+
###############################################################################
16+
# Set the merge driver for project and solution files
17+
#
18+
# Merging from the command prompt will add diff markers to the files if there
19+
# are conflicts (Merging from VS is not affected by the settings below, in VS
20+
# the diff markers are never inserted). Diff markers may cause the following
21+
# file extensions to fail to load in VS. An alternative would be to treat
22+
# these files as binary and thus will always conflict and require user
23+
# intervention with every merge. To do so, just uncomment the entries below
24+
###############################################################################
25+
#*.sln merge=binary
26+
#*.csproj merge=binary
27+
#*.vbproj merge=binary
28+
#*.vcxproj merge=binary
29+
#*.vcproj merge=binary
30+
#*.dbproj merge=binary
31+
#*.fsproj merge=binary
32+
#*.lsproj merge=binary
33+
#*.wixproj merge=binary
34+
#*.modelproj merge=binary
35+
#*.sqlproj merge=binary
36+
#*.wwaproj merge=binary
37+
38+
###############################################################################
39+
# behavior for image files
40+
#
41+
# image files are treated as binary by default.
42+
###############################################################################
43+
#*.jpg binary
44+
#*.png binary
45+
#*.gif binary
46+
47+
###############################################################################
48+
# diff behavior for common document formats
49+
#
50+
# Convert binary document formats to text before diffing them. This feature
51+
# is only available from the command line. Turn it on by uncommenting the
52+
# entries below.
53+
###############################################################################
54+
#*.doc diff=astextplain
55+
#*.DOC diff=astextplain
56+
#*.docx diff=astextplain
57+
#*.DOCX diff=astextplain
58+
#*.dot diff=astextplain
59+
#*.DOT diff=astextplain
60+
#*.pdf diff=astextplain
61+
#*.PDF diff=astextplain
62+
#*.rtf diff=astextplain
63+
#*.RTF diff=astextplain

‎.openpublishing.publish.config.json‎

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,30 @@
11
{
22
"build_entry_point": "docs",
3-
"need_generate_pdf": false,
4-
"need_generate_intellisense": false,
5-
"branch_target_mapping": {
6-
"live": [
7-
"Publish",
8-
"Pdf"
9-
],
10-
"master": [
11-
"Publish",
12-
"Pdf"
13-
]
14-
},
15-
"Targets": {
16-
"Pdf": {
17-
"template_folder": "_themes.pdf"
18-
}
19-
},
203
"docsets_to_publish": [
214
{
225
"docset_name": "vcppdocs",
236
"build_source_folder": "docs",
247
"build_output_subfolder": "vcppdocs",
258
"locale": "en-us",
26-
"version": 0,
9+
"monikers": [],
10+
"moniker_ranges": [],
2711
"open_to_public_contributors": true,
2812
"type_mapping": {
2913
"Conceptual": "Content",
3014
"ManagedReference": "Content",
3115
"RestApi": "Content"
3216
},
33-
"template_folder": "_themes"
17+
"template_folder": "_themes",
18+
"version": 0
3419
}
3520
],
3621
"notification_subscribers": [],
3722
"branches_to_filter": [],
38-
"skip_source_output_uploading": false,
3923
"git_repository_url_open_to_public_contributors": "https://github.com/Microsoft/cpp-docs",
4024
"git_repository_branch_open_to_public_contributors": "master",
25+
"skip_source_output_uploading": false,
4126
"need_preview_pull_request": true,
27+
"enable_incremental_build": true,
4228
"dependent_repositories": [
4329
{
4430
"path_to_root": "_themes",
@@ -49,9 +35,26 @@
4935
{
5036
"path_to_root": "_themes.pdf",
5137
"url": "https://github.com/Microsoft/templates.docs.msft.pdf",
52-
"branch": "master"
38+
"branch": "master",
39+
"branch_mapping": {}
5340
}
5441
],
42+
"branch_target_mapping": {
43+
"live": [
44+
"Publish",
45+
"Pdf"
46+
],
47+
"master": [
48+
"Publish",
49+
"Pdf"
50+
]
51+
},
5552
"need_generate_pdf_url_template": true,
56-
"enable_incremental_build": true
57-
}
53+
"targets": {
54+
"Pdf": {
55+
"template_folder": "_themes.pdf"
56+
}
57+
},
58+
"need_generate_pdf": false,
59+
"need_generate_intellisense": false
60+
}

0 commit comments

Comments
 (0)