profile
viewpoint
tjwei tjwei Taipei, Taiwan http://weijr-note.blogspot.com the avatar is generated by my Quick-Neural-Art-Transfer with a picture of Hatsune Miku

push eventtjwei/obama_pix2pix

tjwei

commit sha 8b7db68874627516136873c6108f4d19ca56a93f

add ipynb files

view details

push time in 2 days

create barnchtjwei/obama_pix2pix

branch : master

created branch time in 2 days

created repositorytjwei/obama_pix2pix

demo of pix2pix face transformation

created time in 2 days

push eventtjwei/test

tjwei

commit sha c28821c57881a00622d9113831dbc92ae6e2c21d

English

view details

tjwei

commit sha acb61a97265d641e4b7e543224fd698e019caeb0

Merge pull request #1 from tjwei/english English

view details

push time in a month

PR merged tjwei/test

English

translate to English

+2 -2

0 comment

1 changed file

tjwei

pr closed time in a month

PR opened tjwei/test

English

translate to English

+2 -2

0 comment

1 changed file

pr created time in a month

push eventtjwei/test

tjwei

commit sha 1d5527bd5848fc00afc523656403d0ec54d27bfb

Add files via upload

view details

push time in a month

create barnchtjwei/test

branch : english

created branch time in a month

push eventtjwei/test

tjwei

commit sha 23afdafa11353a67ab58a02250795428048bdd62

longer

view details

push time in a month

push eventtjwei/test

tjwei

commit sha 6c3678fd4f5882da449567b5ff67eef59262598a

add test.md

view details

push time in a month

create barnchtjwei/test

branch : master

created branch time in a month

created repositorytjwei/test

created time in a month

issue commenttjwei/2048-NN

Suggestion: Training outputs

The assumption is correct, it has four actions. Thanks for the suggestions.

Torrenal notifications@github.com 於 2019年5月28日 週二 上午11:49寫道:

I'm assuming that when training the AI, it had only 4 outputs (north,south,east,west). Apologies if that's a faulty assumption.

For training the network, you might consider training it for a few additional outputs - not because you need them to play the game, but because by needing to provide them, the network will need an additional awareness of the game mechanics. 4 outputs (N/S/E/W) for when a move in that direction is possible, 0 if not possible. 4 outputs (N/S/E/W) for when a move in that direction will merge tiles. 1 output for a complexity score of the remaining tiles, after whatever mergers happen for the requested move.

The 'human' analog of training for these outputs would be 'learning the rules of the game' - It'll know when tiles merge and it'll know when moves are invalid, and it may internalize some of the logic for that in its decision process for moves.

— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub https://github.com/tjwei/2048-NN/issues/8?email_source=notifications&email_token=AAH4CSV5W7G5J2JVCT5WPR3PXSTULA5CNFSM4HP7QS52YY3PNVWWK3TUL52HS4DFUVEXG43VMWVGG33NNVSW45C7NFSM4GWD7XFQ, or mute the thread https://github.com/notifications/unsubscribe-auth/AAH4CSVAQXZBUN5YM577LVLPXSTULANCNFSM4HP7QS5Q .

Torrenal

comment created time in 2 months

fork tjwei/alog

Python logging for Humans.

fork in 2 months

create barnchtjwei/hello

branch : master2

created branch time in 2 months

push eventtjwei/hello

tjwei

commit sha a29df0d95126019b73da218cc38acac3c341dd63

Add files via upload

view details

push time in 2 months

push eventtjwei/hello

tjwei

commit sha 4d3411157ccaf1ad744a83153834104388a8fc00

Update README.md

view details

push time in 2 months

push eventtjwei/hello

tjwei

commit sha c25dc85f21aae601390a8dbd6def1a7757792fd3

test web ui

view details

push time in 2 months

create barnchtjwei/hello

branch : new_branch

created branch time in 2 months

push eventtjwei/hello

tjwei

commit sha b31ae824333752bd5549fc72fa290250d7c5a8b7

demo add a new line

view details

push time in 2 months

create barnchtjwei/hello

branch : master

created branch time in 2 months

created repositorytjwei/hello

test github

created time in 2 months

delete branch tjwei/merge-conflicts

delete branch : add-education

delete time in 2 months

push eventtjwei/merge-conflicts

GitHub Teacher

commit sha b05509ab7cdc9a5a2b356d07958a5cc8c13fb9b0

commit for education branch

view details

tjwei

commit sha 6097dde8f4db9c8714ba1320dabbdbae5774c9b6

Update education.yml

view details

tjwei

commit sha 4ca031b3c82987d4112ed22646bb648fac660691

Merge branch 'master' into add-education

view details

tjwei

commit sha b35256494cafa09eae838374bfcd53455f0a3f94

Merge pull request #4 from tjwei/add-education Create your own conflict

view details

push time in 2 months

PR merged tjwei/merge-conflicts

Create your own conflict

Step 5: Create your own conflict

So far, this pull request doesn't have any conflicts. I have added some new branch protections to prevent you from merging before you're ready.

In the last activity, you solved a merge conflict that someone else created. This time, you'll create the merge conflict yourself.

:keyboard: Activity: Make changes on this branch

  1. Click on the Files changed tab in this pull request.
  2. Click the :pencil2: found in the top right-hand corner of the _data/education.yml file that had been previously modified.
  3. Modify the content in the degree:, uni:, year:, and summary: lines.
  4. Scroll to the bottom of the page and enter a commit message for your change.
  5. Click the Commit changes button, making sure the "Commit directly to the add-education branch" option is selected.

<hr> <h3 align="center">Watch below for my response.</h3>

+6 -5

2 comments

1 changed file

github-learning-lab[bot]

pr closed time in 2 months

push eventtjwei/merge-conflicts

GitHub Teacher

commit sha 4cbe0fe45595d99d49e26703532c114b0572bb96

Resolve merge conflict without checking

view details

GitHub Teacher

commit sha 6d8bbbc198af37ed94f613e47d71455c8576a4f9

Change skatetocat to surftocat

view details

GitHub Teacher

commit sha 67adaeffb869845d305b3551b40cda339e1e0d6c

Add surfing and internship experience

view details

GitHub Teacher

commit sha a82fbfc2bd9ce82a72bf4fe5f2c602e31f1d07f9

Add artifacts

view details

GitHub Teacher

commit sha 1363a52534bca4239523967c2c65f410e3112e6f

Update README.md

view details

GitHub Teacher

commit sha 8f0f219cd53ff347ea6cabb4c1aa44e363746865

Minor syntax update

view details

GitHub Teacher

commit sha 4de72bb1f9a4228c0a2ee2b934ebaa20d94f89d3

Replace issue tab link

view details

GitHub Teacher

commit sha c2dd6e978e1aaae921706c2f4b73b156d221ed58

Update README.md

view details

GitHub Teacher

commit sha 278f6591bfc0870070576470496cfab2191656c7

Update README.md

view details

GitHub Teacher

commit sha c41e33228e3c9654f2e0dd627d39d86f9ee71884

Update README.md

view details

snyk-bot

commit sha 97f727d93fbe4a0601f910e7727a6fa19259fe86

fix: Gemfile.lock & Gemfile to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-FFI-22037 - https://snyk.io/vuln/SNYK-RUBY-NOKOGIRI-72433

view details

GitHub Teacher

commit sha 705a4c89550e8512f64ed2987514642fea664b16

Merge pull request #1 from githubtraining/snyk-fix-levx48 [Snyk] Fix for 2 vulnerable dependencies

view details

GitHub Teacher

commit sha 0e28c721ccd31d3de095d4c394dae969d1f05f28

add GitHubteacher info to config

view details

GitHub Teacher

commit sha 806f4a5510e7bd6d85595455159f1a16ada79667

add experience

view details

GitHub Teacher

commit sha b7c7ed4dff63a6d5531a4f17e298e87a5015b8ed

add education conflict content

view details

tjwei

commit sha 0e0912fbb55b401e7feeacbb95078e7ba5d3cb80

Merge branch 'master' into update-config

view details

tjwei

commit sha e4a05ee9673fb513f7f23b9e3d6ff76e3f5280ba

Merge pull request #1 from tjwei/update-config Welcome! Let's resolve a conflict

view details

tjwei

commit sha 58da9b08dc9ae1f61ca7147d802bbfb7a3a2289f

Merge branch 'master' into add-experience

view details

tjwei

commit sha d8793f4ee224dca68abc8bfece39a1409c2c0d14

Merge pull request #3 from tjwei/add-experience More conflicts

view details

github-learning-lab[bot]

commit sha 422e9a2eed775745859538d2f185ed004357ba9d

Merge pull request #2 from tjwei/education-conflict Another User's Change

view details

push time in 2 months

push eventtjwei/merge-conflicts

tjwei

commit sha 6097dde8f4db9c8714ba1320dabbdbae5774c9b6

Update education.yml

view details

push time in 2 months

delete branch tjwei/merge-conflicts

delete branch : tjwei-patch-1

delete time in 2 months

create barnchtjwei/merge-conflicts

branch : tjwei-patch-1

created branch time in 2 months

delete branch tjwei/merge-conflicts

delete branch : add-experience

delete time in 2 months

push eventtjwei/merge-conflicts

GitHub Teacher

commit sha 806f4a5510e7bd6d85595455159f1a16ada79667

add experience

view details

tjwei

commit sha 58da9b08dc9ae1f61ca7147d802bbfb7a3a2289f

Merge branch 'master' into add-experience

view details

tjwei

commit sha d8793f4ee224dca68abc8bfece39a1409c2c0d14

Merge pull request #3 from tjwei/add-experience More conflicts

view details

push time in 2 months

PR merged tjwei/merge-conflicts

More conflicts

Step 3: Resolve more complex conflicts

Just like your first conflict, this pull request is already conflicted.

This time, however, I've made it a bit more complicated.

  • Instead of one conflict, you get three!
  • Instead of conflicts in one file only, you get two!
  • One of your files actually has some leftover merge conflict markers. This can happen if someone forgets to remove the markers while resolving a conflict.

:keyboard: Activity: Resolve these conflicts

  1. Click Resolve conflicts.
  2. On the left, you will notice two files listed: _data/experience.yml and _data/interests.yml. Let's start with _data/experience.yml.
  3. Remove the conflict markers and pick your desired content.
  4. With the merge conflicts resolved and the markers removed in the _data/experience.yml file, click Mark as resolved.
  5. GitHub will present the next file with conflicts, _data/interests.yml.
  6. Remove the conflict markers and pick your desired content.
  7. When you are finished, click Mark as resolved.
  8. Click Commit merge.

<hr> <h3 align="center">Watch below for my response.</h3>

+13 -21

1 comment

2 changed files

github-learning-lab[bot]

pr closed time in 2 months

push eventtjwei/merge-conflicts

GitHub Teacher

commit sha 4cbe0fe45595d99d49e26703532c114b0572bb96

Resolve merge conflict without checking

view details

GitHub Teacher

commit sha 6d8bbbc198af37ed94f613e47d71455c8576a4f9

Change skatetocat to surftocat

view details

GitHub Teacher

commit sha 67adaeffb869845d305b3551b40cda339e1e0d6c

Add surfing and internship experience

view details

GitHub Teacher

commit sha a82fbfc2bd9ce82a72bf4fe5f2c602e31f1d07f9

Add artifacts

view details

GitHub Teacher

commit sha 1363a52534bca4239523967c2c65f410e3112e6f

Update README.md

view details

GitHub Teacher

commit sha 8f0f219cd53ff347ea6cabb4c1aa44e363746865

Minor syntax update

view details

GitHub Teacher

commit sha 4de72bb1f9a4228c0a2ee2b934ebaa20d94f89d3

Replace issue tab link

view details

GitHub Teacher

commit sha c2dd6e978e1aaae921706c2f4b73b156d221ed58

Update README.md

view details

GitHub Teacher

commit sha 278f6591bfc0870070576470496cfab2191656c7

Update README.md

view details

GitHub Teacher

commit sha c41e33228e3c9654f2e0dd627d39d86f9ee71884

Update README.md

view details

snyk-bot

commit sha 97f727d93fbe4a0601f910e7727a6fa19259fe86

fix: Gemfile.lock & Gemfile to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-FFI-22037 - https://snyk.io/vuln/SNYK-RUBY-NOKOGIRI-72433

view details

GitHub Teacher

commit sha 705a4c89550e8512f64ed2987514642fea664b16

Merge pull request #1 from githubtraining/snyk-fix-levx48 [Snyk] Fix for 2 vulnerable dependencies

view details

GitHub Teacher

commit sha 0e28c721ccd31d3de095d4c394dae969d1f05f28

add GitHubteacher info to config

view details

tjwei

commit sha 0e0912fbb55b401e7feeacbb95078e7ba5d3cb80

Merge branch 'master' into update-config

view details

tjwei

commit sha e4a05ee9673fb513f7f23b9e3d6ff76e3f5280ba

Merge pull request #1 from tjwei/update-config Welcome! Let's resolve a conflict

view details

tjwei

commit sha 58da9b08dc9ae1f61ca7147d802bbfb7a3a2289f

Merge branch 'master' into add-experience

view details

push time in 2 months

delete branch tjwei/merge-conflicts

delete branch : update-config

delete time in 2 months

push eventtjwei/merge-conflicts

GitHub Teacher

commit sha 0e28c721ccd31d3de095d4c394dae969d1f05f28

add GitHubteacher info to config

view details

tjwei

commit sha 0e0912fbb55b401e7feeacbb95078e7ba5d3cb80

Merge branch 'master' into update-config

view details

tjwei

commit sha e4a05ee9673fb513f7f23b9e3d6ff76e3f5280ba

Merge pull request #1 from tjwei/update-config Welcome! Let's resolve a conflict

view details

push time in 2 months

PR merged tjwei/merge-conflicts

Welcome! Let's resolve a conflict

Welcome to Managing Merge Conflicts :tada:

Hello, and welcome! If you're here to learn about and practice resolving merge conflicts, you're in the right place.

In this course, you'll learn why merge conflicts happen and solve a few of them. The merge conflicts in this course are simple enough to solve from GitHub.com. But, if you'd prefer, you can solve them using the command line or other local tools.

As an added bonus, the project we are using for this course is a resume hosted on GitHub Pages! So, if you want to keep working after you complete this course, please feel free!

Before starting this course, we recommend completing the Introduction to GitHub Learning Lab first.

Note: You may notice that some branches and pull requests already exist. We'll be using them in later activities in this course.

How merge conflicts happen

A Merge conflict occurs when changes are made to the same part of the same file on two different branches. You usually find out about conflicts in a pull request.

This can be intimidating, but have no fear, Git knows how to handle this! It only needs a human to decide how to resolve the conflict.

Step 1: Resolve a simple conflict

You may merge a lot of pull requests before you encounter your first merge conflict. That’s because Git is smart when it comes to merging. Unless you're paying close attention to other branches, you won't know about conflicts until you create a pull request.

This branch is a great example. In this scenario, two of our friends have been working in this repository. They both created branches, made changes to the _config.yml file, and opened pull requests. One pull request was merged to master without problems, but now the other pull request has a conflict.

The history of master and this branch look something like this:

deviated branches

Because this pull request changes the same lines in the _config.yml file, there is a merge conflict.

Let's help our friends resolve this conflict.

:keyboard: Activity: Resolving your first merge conflict

  1. At the bottom of the page in the "This branch has conflicts that must be resolved" section of the Pull Request, click the Resolve conflicts button.

  2. Look for the highlighted sections that begins with <<<<<<< update-config and ends with >>>>>>> master. These markers are added by Git to show you the content that is in conflict.

  3. Remove the changes made on the master branch by deleting all of the content below the ======= and above >>>>>>> master.

  4. Next, remove the merge conflict markers by deleting the following lines:

    <<<<<<< update-config
    =======
     >>>>>>> master
    
  5. With the merge conflict markers removed, click Mark as resolved.

  6. Finally, click Commit merge.

Sometimes, the best way to resolve a merge conflict is to add content that's from both branches, or even something that isn't on either! This is why Git needs a human to look at the code and make the proper fixes.

<hr> <h3 align="center">Watch below for my response.</h3>

+7 -6

1 comment

1 changed file

github-learning-lab[bot]

pr closed time in 2 months

push eventtjwei/merge-conflicts

GitHub Teacher

commit sha 4cbe0fe45595d99d49e26703532c114b0572bb96

Resolve merge conflict without checking

view details

GitHub Teacher

commit sha 6d8bbbc198af37ed94f613e47d71455c8576a4f9

Change skatetocat to surftocat

view details

GitHub Teacher

commit sha 67adaeffb869845d305b3551b40cda339e1e0d6c

Add surfing and internship experience

view details

GitHub Teacher

commit sha a82fbfc2bd9ce82a72bf4fe5f2c602e31f1d07f9

Add artifacts

view details

GitHub Teacher

commit sha 1363a52534bca4239523967c2c65f410e3112e6f

Update README.md

view details

GitHub Teacher

commit sha 8f0f219cd53ff347ea6cabb4c1aa44e363746865

Minor syntax update

view details

GitHub Teacher

commit sha 4de72bb1f9a4228c0a2ee2b934ebaa20d94f89d3

Replace issue tab link

view details

GitHub Teacher

commit sha c2dd6e978e1aaae921706c2f4b73b156d221ed58

Update README.md

view details

GitHub Teacher

commit sha 278f6591bfc0870070576470496cfab2191656c7

Update README.md

view details

GitHub Teacher

commit sha c41e33228e3c9654f2e0dd627d39d86f9ee71884

Update README.md

view details

snyk-bot

commit sha 97f727d93fbe4a0601f910e7727a6fa19259fe86

fix: Gemfile.lock & Gemfile to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-FFI-22037 - https://snyk.io/vuln/SNYK-RUBY-NOKOGIRI-72433

view details

GitHub Teacher

commit sha 705a4c89550e8512f64ed2987514642fea664b16

Merge pull request #1 from githubtraining/snyk-fix-levx48 [Snyk] Fix for 2 vulnerable dependencies

view details

tjwei

commit sha 0e0912fbb55b401e7feeacbb95078e7ba5d3cb80

Merge branch 'master' into update-config

view details

push time in 2 months

create barnchtjwei/merge-conflicts

branch : update-config

created branch time in 2 months

create barnchtjwei/merge-conflicts

branch : master

created branch time in 2 months

create barnchtjwei/merge-conflicts

branch : add-experience

created branch time in 2 months

create barnchtjwei/merge-conflicts

branch : add-education

created branch time in 2 months

create barnchtjwei/merge-conflicts

branch : education-conflict

created branch time in 2 months

created repositorytjwei/merge-conflicts

created time in 2 months

issue commenttjwei/GANotebooks

How to get started?

Extract video frames into png files, e.g. using ffmpeg Then modify the lines like Image.open('CycleGAN/A/A_%05d.png'%i).convert('RGB') to the corresponding file name pattern.

wengsiangchan

comment created time in 2 months

startedmoskytw/hypothesis-testing-with-python

started time in 2 months

more