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

Agreement on Compatibility #68

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Agreement on Compatibility #68

wants to merge 3 commits into from

Conversation

gmilano
Copy link
Contributor

@gmilano gmilano commented Jun 21, 2019

No description provided.

@cinthamo
Copy link
Contributor

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.

@gmilano gmilano requested a review from juandiana June 21, 2019 17:03
README.md Outdated Show resolved Hide resolved
Co-Authored-By: Juan Andrés <[email protected]>
@cinthamo
Copy link
Contributor

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
Copy link
Contributor

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.

@gmilano gmilano requested a review from juandiana June 24, 2019 15:50
@cinthamo cinthamo removed the conflict label Jun 24, 2019
@gmilano gmilano requested review from anaiberta and juandiana and removed request for juandiana June 24, 2019 16:10
@genexusbot
Copy link
Collaborator

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

@genexusbot
Copy link
Collaborator

Merge to beta success

@genexusbot
Copy link
Collaborator

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

@cinthamo
Copy link
Contributor

cinthamo commented Sep 4, 2024

Manual cherry pick to beta success

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.

5 participants