fix(cli): fix the wrong graph in "gas log" when merging branches #1101
Conversation
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
Pull Request Test Coverage Report for Build 1475232524
💛 - Coveralls |
linjiX
reviewed
Nov 15, 2021
marshallmallows
force-pushed
the
T19755_gas_log_merge_err
branch
from
47c1d43 to
308828c
Compare
linjiX
requested changes
Nov 15, 2021
marshallmallows
force-pushed
the
T19755_gas_log_merge_err
branch
from
308828c to
a1017cb
Compare
marshallmallows
force-pushed
the
T19755_gas_log_merge_err
branch
from
a1017cb to
10edd4a
Compare
linjiX
requested changes
Nov 15, 2021
linjiX
requested changes
Nov 15, 2021
linjiX
requested changes
Nov 15, 2021
marshallmallows
force-pushed
the
T19755_gas_log_merge_err
branch
from
10edd4a to
34c48e2
Compare
linjiX
requested changes
Nov 15, 2021
marshallmallows
force-pushed
the
T19755_gas_log_merge_err
branch
from
34c48e2 to
4fb0df9
Compare
marshallmallows
force-pushed
the
T19755_gas_log_merge_err
branch
from
4fb0df9 to
c9343c0
Compare
linjiX
reviewed
Nov 15, 2021
marshallmallows
force-pushed
the
T19755_gas_log_merge_err
branch
from
c9343c0 to
c156153
Compare
linjiX
reviewed
Nov 16, 2021
marshallmallows
force-pushed
the
T19755_gas_log_merge_err
branch
2 times, most recently
from
cbfa4f9 to
8ed12d6
Compare
|
the gas log graph in commit message should be put into a code block |
marshallmallows
force-pushed
the
T19755_gas_log_merge_err
branch
3 times, most recently
from
d54dd51 to
ba8c9ea
Compare
Lee-000
approved these changes
Nov 18, 2021
marshallmallows
force-pushed
the
T19755_gas_log_merge_err
branch
from
ba8c9ea to
c128a5e
Compare
linjiX
approved these changes
Nov 18, 2021
When merging the left branch, the right branch also needs to move to the left The wrong sample: ``` * 4c564ea (b3) 15 * a3f25ce 13 * ebb775e 8 | * 2da7d6e (b1) 14 | * aeac003 6 | | * 8c9e82e (main) 12 | | | * 1c22915 (b5) 11 | | |/ | |/| | * | bec94e0 a | | | * ef0e4c2 (b2) 10 | | | * dee8986 7 | | |/ | |/| |/| | * | | d7677e0 4 * | | e1d77c4 3 |/| | | * f478341 (b4) 9 | |/ | * dc2a3cc 5 |/ * d0eeb20 2 * bce9056 1 ``` Fixed: ``` * 4c564ea (* ebb775e 8 | * 2da7d6e (b1) 14 | * aeac003 6 | | * 8c9e82e (main) 12 | | | * 1c22915 (b5) 11 | | |/ | |/| | * | bec94e0 a | | | * ef0e4c2 (b2) 10 | | | * dee8986 7 | | |/ | |/| |/| | * | | d7677e0 4 * | | e1d77c4 3 |/ / | | * f478341 (b4) 9 | |/ | * dc2a3cc 5 |/ * d0eeb20 2 * bce9056 1 ``` PR Closed: Graviti-AI#1101
marshallmallows
force-pushed
the
T19755_gas_log_merge_err
branch
from
c128a5e to
55305d7
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When merging the left branch, the right branch also needs to move to the left
The wrong sample:
Fixed: