Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#355: fix pre.previous_sibling become None Bug at yukicoder #361

Merged
merged 6 commits into from
Mar 8, 2019

Conversation

uta8a
Copy link
Contributor

@uta8a uta8a commented Mar 8, 2019

pre.previous_siblingとtestの修正をまとめて一つにしています。
もし何か間違っていたら再度修正します。

@kmyk
Copy link
Member

kmyk commented Mar 8, 2019

よさそうなのでマージします。
CIもちゃんと通っています (https://travis-ci.org/kmyk/online-judge-tools/builds/503388706)。

@kmyk kmyk merged commit f57d196 into online-judge-tools:master Mar 8, 2019
@kmyk
Copy link
Member

kmyk commented Mar 8, 2019

ただし、これではrebaseはできていなかったことは注意しておきます。
マージ前のコミットグラフ (https://github.com/kmyk/online-judge-tools/network とか $ git log --graph --oneline --all で見れる) は次のようになっていました。

screenshot from 2019-03-08 16-27-42

しかしrebaseをするというと不要なコミットを削除しながら組み換えて以下のような状態へすることを指します。

rebased

fukatani added a commit to fukatani/online-judge-tools that referenced this pull request Jul 2, 2019
fukatani added a commit to fukatani/online-judge-tools that referenced this pull request Jul 2, 2019
fukatani added a commit to fukatani/online-judge-tools that referenced this pull request Jul 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants