Meine Gedankenstütze ;-)
git checkout better_branch
git merge --strategy=ours master # keep the content of this branch, but record a merge
git checkout master
git merge better_branch # fast-forward master up to the merge
Um die Historie besser nachvollziehen zu können:
git merge --strategy=ours --no-commit master
git commit # add information to the template merge message
Quelle: Stackoverflow
Sofern die Software auf älteren Systemen als Windows 10 verwendet wird, muss aktiv C#-Code:
ServicePointManager.Expect100Continue = true;
ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
gesetzt werden, denn der default Type des Protokolls setzt das Betriebssystem – und .NET verwendet dann das default gesetzte.
Quelle: mycsharp.de
"files.eol": "\n"
I use Windows 10 home and I usually use Visual Studio Code (VSCODE) to edit Linux Bash scripts as well as PHP and JavaScript. I don’t develop anything dedicated for Windows and I wouldn’t mind tha…
In ~/.ssh/config, add:
host github.com
HostName github.com
IdentityFile ~/.ssh/id_rsa_github
User gitgit log --since 2020-05-17 --pretty="short" --name-onlyAlle registrierten EventListener anzeigen lassen
Array.from(document.querySelectorAll('*'))
.reduce(function(pre, dom){
var evtObj = getEventListeners(dom)
Object.keys(evtObj).forEach(function (evt) {
if (typeof pre[evt] === 'undefined') {
pre[evt] = 0
}
pre[evt] += evtObj[evt].length
})
return pre
}, {})Nur die registrierten Klick-Listener anzeigen lassen
Array.from(document.querySelectorAll('*'))
.reduce(function(pre, dom){
var clks = getEventListeners(dom).click;
pre += clks ? clks.length || 0 : 0;
return pre
}, 0)>cd c:\Program Files\Git\etc\ssh\
add to ssh_config following:
AddKeysToAgent yes
IdentityFile ~/.ssh/id_rsa
IdentityFile ~/.ssh/id_rsa_test
ps. you need ssh version >= 7.2 (date of release 2016-02-28)
WICHTIG: Über Putty-Keygen muss der Private-Key über Conversions > Export OpenSSH Key (force new file format) exportiert werden
Hold down the OPTION key and right-click on the Finder icon in the Dock, choose “Relaunch”
– Open Automator
– File -> New -> Service
– Change „Service Receives“ to „files or folders“ in „Finder“
– Add a „Run Shell Script“ action
– Change „Pass input“ to „as arguments“
– Paste the following in the shell script box: open -n -b „com.microsoft.VSCode“ –args „$*“
– Save it as something like „Open in Visual Studio Code“