Skip to content

Releases: nchantarotwong/gha-upmerge

v1.0.5

28 Jan 00:28
@nchantarotwong nchantarotwong
v1.0.5
4fa82ca
This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode.
Compare
Choose a tag to compare
v1.0.5 Latest
Latest

removed --no-ff

Assets 2
Loading

v1.0.4

28 Jan 00:14
@nchantarotwong nchantarotwong
v1.0.4
173815e
This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode.
Compare
Choose a tag to compare
v1.0.4

switch to -X theirs

Assets 2
Loading

v1.0.3

27 Jan 03:14
@nchantarotwong nchantarotwong
v1.0.3
48fe6fe
This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode.
Compare
Choose a tag to compare
v1.0.3

added --strategy-option ours

Assets 2
Loading

v1.0.2

27 Jan 02:46
@nchantarotwong nchantarotwong
v1.0.2
9cb8090
This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode.
Compare
Choose a tag to compare
v1.0.2

Added --allow-unrelated-histories to merge

Assets 2
Loading