JavaClasses icon indicating copy to clipboard operation
JavaClasses copied to clipboard

Agreement on Compatibility

Open gmilano opened this issue 6 years ago • 7 comments

gmilano avatar Jun 21 '19 17:06 gmilano

Merge to beta failed

git merge -q origin/gmilano-patch-2 Auto-merging README.md CONFLICT (content): Merge conflict in README.md Automatic merge failed; fix conflicts and then commit the result.

cinthamo avatar Jun 21 '19 17:06 cinthamo

Merge to beta failed

git merge -q origin/gmilano-patch-2 Auto-merging README.md CONFLICT (content): Merge conflict in README.md Automatic merge failed; fix conflicts and then commit the result.

cinthamo avatar Jun 24 '19 15:06 cinthamo

Merge to beta failed

git merge -q origin/gmilano-patch-2 Auto-merging README.md CONFLICT (content): Merge conflict in README.md Automatic merge failed; fix conflicts and then commit the result.

cinthamo avatar Jun 24 '19 15:06 cinthamo

Cherry pick to beta failed, 1 conflicted file
  • README.md

genexusbot avatar Nov 14 '19 15:11 genexusbot

Merge to beta success
  • 72742fc0
  • 57fb6ab6

genexusbot avatar Dec 21 '21 18:12 genexusbot

BETA RESET - Cherry pick to beta failed, 1 conflicted file in commit 72742fc0
  • README.md

genexusbot avatar Sep 03 '24 17:09 genexusbot

Manual cherry pick to beta success
  • 72742fc0
  • 57fb6ab6

cinthamo avatar Sep 04 '24 12:09 cinthamo