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.

Sign up for GitHub

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

Jump to bottom

feat(git): add user commits message as part of the Amplication merge conflicts auto-resolution commit #7574

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

feat(git): add user commits message as part of the Amplication merge conflicts auto-resolution commit #7574

wants to merge 6 commits into from

Conversation

Meyazhagan
Copy link
Contributor

@Meyazhagan Meyazhagan commented Dec 11, 2023 •
edited
Loading

Close: #6194

PR Details

PR Checklist

  • Tests for the changes have been added
  • npm test doesn't throw any error

IMPORTANT: Please review the CONTRIBUTING.md file for detailed contributing guidelines.

@Meyazhagan
Copy link
Contributor Author

Meyazhagan commented Feb 7, 2024 •
edited
Loading

Screenshot:

image

@Meyazhagan Meyazhagan changed the title feat(git): auto merge conflicts and retain user commits feat(git): add user commits message as part of the Amplication merge conflicts auto-resolution commit Feb 7, 2024
@Meyazhagan
Copy link
Contributor Author

@overbit can you review this PR

overbit
overbit suggested changes Feb 9, 2024
View reviewed changes
libs/util/git/src/git-client.service.ts Outdated Show resolved Hide resolved
@yuval-hazaz
Copy link
Member

yuval-hazaz commented May 25, 2024 •
edited
Loading

@overbit @mulygottlieb please review this PR and the underline ticket.
I know that we went through some massive changes in this area so please first validate whether we still need this change.
(I see that the issue in on status "on hold" )

@Meyazhagan
Copy link
Contributor Author

@overbit @mulygottlieb can you review this PR?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@overbit overbit Awaiting requested review from overbit

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
app:amplication-build-manager app:amplication-git-pull-request-service app:amplication-server app:amplication-storage-gateway app:git-sync-manager app:gpt-gateway app:notification-service lib:schema-registry lib:util-git
Projects
None yet
Milestone
No milestone
3 participants
@Meyazhagan @yuval-hazaz @overbit