pull requestでは、ファイルの更新がかち合っただけでgitHubのWebページ上では編集できなくなる。
gitHubのヒントに、コマンドベースで解決する方法は載っているが、win上でtortoiseGitを使っている場合に面倒なので解決策を記してみる。
gitHubで出てくるコマンドはこんな感じ :
mayuki
/ CredentialUI.cs
Created
March 22, 2010 10:22
Windows Common Credential UI Helper for .NET Framework
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| /* | |
| * CredentialUI.cs - Windows Credential UI Helper | |
| * | |
| * License: Public Domain | |
| * | |
| */ | |
| using System; | |
| using System.ComponentModel; | |
| using System.Runtime.InteropServices; | |
| using System.Security; |
kohashi
/ on_tortoiseGit_pull_request.ja.markdown
Created
March 28, 2012 16:47
tortoiseGitから、gitHub上のpull requestを解決する
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| CACHE MANIFEST | |
| NETWORK: | |
| * |
oppara
/ PHPUnit_vfsStream_memo.php
Created
November 1, 2012 04:50
— forked from daneko/PHPUnit_vfsStream_memo.php
PHPUnit vfsStreamの使用方法メモ
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| <?php | |
| require_once 'PHPUnit/Framework/TestCase.php'; | |
| require_once 'vfsStream/vfsStream.php'; | |
| // require_once 'hoge.php'; | |
| /** | |
| * ファイルシステムのテストに関してはURL参照 | |
| * とりあえずざっくり使う方法メモ | |
| * @see http://www.phpunit.de/manual/3.6/ja/test-doubles.html#test-doubles.mocking-the-filesystem.examples.ExampleTest.php |
this scripts installs: Flash, PDF, for some Chromium OS builds. (confirmed on Vanilla build 3389 Built on 12th December 2012!) Carputers confirmed that it also works on ArnoldTheBat's Cx86OS-20130423010101 build!
Sadly enough the Hangouts stopped working! i don't know about Netflix, since i can't test it. and since ~4-08-2013 MP3/Mp4 stopped working?
if you want to use this script on ArnoldTheBat's Chromium OS build, keep in mind that he uses the password: "password" instead of "facepunch". (without the quotes ;))
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| <!DOCTYPE html> | |
| <html lang="ja"> | |
| <head> | |
| <meta charset="utf-8"> | |
| <title>File API Sample</title> | |
| <style type="text/css"> | |
| #file-input div.input { | |
| padding: 60px; | |
| border: solid 1px #333; | |
| width: 300px; |
http://d.hatena.ne.jp/teramako/20130703/p1
class Foo {
constructor(name) {
this.name = name;
}
hello () {
console.log("Hello World");
}
uupaa
/ canvas.toDataURL.image.webp.md
Last active
April 11, 2021 13:37
canvas.toDataURL("image/webp");
<canvas id="canvas"></canvas>
<script>
var ctx = canvas.getContext("2d");
ctx.fillStyle = "red";
ctx.fillRect(0, 0, 8, 8);
var webp = canvas.toDataURL("image/webp"); // Chrome only?
var png = canvas.toDataURL("image/png");
var jpg = canvas.toDataURL("image/jpeg");
uupaa
/ How to create the Base64 image string by the Chrome Browser.md
Last active
May 25, 2021 06:48
How to create the Base64 image string by the Chrome Browser.
Chrome ブラウザだけで、画像の DataURI を簡単に取得する方法を紹介します。
-
適当な画像を右クリックし
新しいタブで画像を開くを選択します。 -
新しいタブで表示された画像をさらに右クリックし、
要素の検証を選択します。
OlderNewer