Sarah Schneider
cbf07fec4b
the other middleware perf PR removes this
2021-05-26 15:43:19 -04:00
James M. Greene
1d77863d31
Update highlight.js again ( #19569 )
...
* npm audit fix
* Reinstall rehype-highlight to update highlight.js
2021-05-26 19:23:25 +00:00
Sarah Schneider
3bd9693f23
test datadog on staging
2021-05-26 15:19:01 -04:00
Sarah Schneider
897ee1ea15
Merge branch 'middleware-perf-part2' of github.com:github/docs-internal into middleware-perf
2021-05-26 15:18:50 -04:00
Sarah Schneider
1c6f56f2fd
test datadog on staging
2021-05-26 15:18:45 -04:00
Sarah Schneider
313cbc8785
lint
2021-05-26 15:18:26 -04:00
Sarah Schneider
ce8379edf2
Merge branch 'middleware-perf-part2' of github.com:github/docs-internal into middleware-perf
2021-05-26 15:17:00 -04:00
Sarah Schneider
86d35b4520
recursionnnnnnn
2021-05-26 15:16:51 -04:00
Sarah Schneider
8d08ea6259
Merge branch 'main' of github.com:github/docs-internal into middleware-perf-part2
2021-05-26 15:15:06 -04:00
Sarita Iyer
8176f746aa
Merge branch 'main' into code-scanning-pr-severities-setting
2021-05-26 14:29:55 -04:00
Sarah Schneider
31631b4633
add localized fallbacks to English
2021-05-26 14:28:46 -04:00
Octomerger Bot
8ac386efbb
Merge pull request #6809 from github/repo-sync
...
repo sync
2021-05-27 04:20:40 +10:00
Sarah Schneider
c542a340d9
Merge branch 'main' of github.com:github/docs-internal into github-ae-release-notes
2021-05-26 14:08:23 -04:00
Octomerger Bot
b30a772e15
Merge pull request #19574 from github/repo-sync
...
repo sync
2021-05-27 04:08:01 +10:00
mo khan
53c55d6ac1
Merge branch 'main' into updates-1480-terraform-registries
2021-05-26 12:03:35 -06:00
Octomerger Bot
1ae5cb0d76
Merge branch 'main' into repo-sync
2021-05-27 04:02:11 +10:00
mo khan
bd2010497d
docs: add example of terraform-registry configuration
2021-05-26 12:01:25 -06:00
Sarah Schneider
65ccf8798d
Merge branch 'middleware-perf-part2' of github.com:github/docs-internal into middleware-perf
2021-05-26 13:55:07 -04:00
Sarah Schneider
6eca699e04
Merge branch 'main' of github.com:github/docs-internal into middleware-perf-part2
2021-05-26 13:54:45 -04:00
Mike McDonald
0895ffd1f1
Clarifying that branch protection must be enabled for auto-merge ( #19483 )
2021-05-26 17:47:54 +00:00
Yeikel
d9593f466b
Suggest users to use --force-with-lease instead of --force
...
--force-with-lease is a safer and more recommended approach than --force
force overwrites a remote branch with your local branch.
--force-with-lease is a safer option that will not overwrite any work on the remote branch if more commits were added to the remote branch (by another team-member or coworker or what have you). It ensures you do not overwrite someone elses work by force pushing.
I think your general idea surrounding the command is correct. If the remote branch has the same value as the remote branch on your local machine- you will overwrite remote. If it doesn't have the same value- it indicates a change that someone else made to the remote branch while you were working on your code and thus will not overwrite any code. Obviously if there are additional commits in remote then the values won't be the same.
I just think of --force-with-lease as the option to use when I want to make sure I don't overwrite any teammates code. A lot of teams at my company use --force-with-lease as the default option for a fail-safe. Its unnecessary in most circumstances but will save you lots of headache if you happen to overwrite something that another person contributed to remote.
I'm sure you looked at the docs but there might be some more wordy explanation contained in here:
Read more : https://stackoverflow.com/questions/52823692/git-push-force-with-lease-vs-force
2021-05-26 13:15:25 -04:00
Grace Park
2f3dfa1f41
Merge branch 'main' into localization-grace
2021-05-26 09:04:19 -07:00
Octomerger Bot
acb90399d8
Merge pull request #6796 from github/repo-sync
...
repo sync
2021-05-27 01:54:22 +10:00
Dave Gaeddert
23ed09db5c
Change productVersions to versions in content templates
2021-05-26 10:32:58 -05:00
Octomerger Bot
cd934391c4
Merge pull request #19566 from github/repo-sync
...
repo sync
2021-05-27 01:28:09 +10:00
Octomerger Bot
c412c42659
Merge branch 'main' into repo-sync
2021-05-27 01:22:44 +10:00
Sarah Edwards
15aaf6e065
Add links to improve discoverability ( #19563 )
2021-05-26 15:03:42 +00:00
Sarah Schneider
77e778f359
Merge branch 'main' of github.com:github/docs-internal into github-ae-release-notes
2021-05-26 09:45:44 -04:00
damiante
ab3ccedead
Removed typo "to"
...
Removed the word "to" where it was erroneously inserted
2021-05-26 17:15:54 +10:00
Shreya Prasad
fb6936b874
Delete git-cheatsheet.md
2021-05-26 12:39:41 +05:30
Shreya Prasad
83798c1e75
Added cloning context
2021-05-26 12:29:32 +05:30
Octomerger Bot
b29be2a2bc
Merge pull request #6781 from github/repo-sync
...
repo sync
2021-05-26 15:22:25 +10:00
Grace Park
bc01d565cc
Merge branch 'main' into localization-grace
2021-05-25 21:24:47 -07:00
Grace Park
b18484c35b
fixing escape character
2021-05-25 21:18:44 -07:00
Grace Park
6a321c29e3
updating with headers within the opts and adding 3 tests to cover en and chinese
2021-05-25 21:12:33 -07:00
mc
86eb89f697
[Ready to ship] GitHub Classroom - mention new starter assignment course ( #18878 )
2021-05-25 20:00:13 -07:00
Grey Baker
3d435d61db
Add Telegram Bot Token support to private repo secret scanning ( #19539 )
2021-05-26 00:03:45 +00:00
github-openapi-bot
2a99743b56
Update OpenAPI Descriptions ( #19556 )
2021-05-25 23:56:02 +00:00
Sarah Vessels
a69e61e4c7
Add sponsors.sponsor_sponsorship_payment_complete audit log event docs ( #19382 )
...
* Add sponsor_sponsorship_payment_complete event
* Note when 'created' fires
* Add sponsor_sponsorship_payment_complete
* Apply suggestions from code review
Co-authored-by: jmarlena <6732600+jmarlena@users.noreply.github.com >
2021-05-25 16:30:19 -07:00
Octomerger Bot
983f49e682
Merge pull request #19559 from github/repo-sync
...
repo sync
2021-05-26 08:45:25 +10:00
Octomerger Bot
7cd05cc935
Merge branch 'main' into repo-sync
2021-05-26 08:40:54 +10:00
Octomerger Bot
28cb31d85e
Merge pull request #19558 from github/repo-sync
...
repo sync
2021-05-26 08:10:16 +10:00
Peter Mescalchin
ad1cdfc6eb
Small tweak to an example file pattern match ( #6660 )
2021-05-25 22:10:15 +00:00
Octomerger Bot
93b9276323
Merge branch 'main' into repo-sync
2021-05-26 08:04:39 +10:00
Grace Park
82e9247d95
remove trailing space
2021-05-25 15:01:48 -07:00
Grace Park
04d80b17f8
Merge branch 'localization-grace' of https://github.com/github/docs-internal into localization-grace
2021-05-25 14:58:37 -07:00
Grace Park
3d03eb0002
Merge branch 'main' of https://github.com/github/docs-internal into localization-grace
2021-05-25 14:57:04 -07:00
Grace Park
9c50a1200e
adding test case
2021-05-25 14:56:32 -07:00
Josh Soref
b78de9f54c
Correct steps outputs example -- it needs an id ( #6695 )
2021-05-25 21:28:05 +00:00
Octomerger Bot
551aac282e
Merge pull request #6777 from github/repo-sync
...
repo sync
2021-05-26 07:19:06 +10:00
