aws-amplify / aws-amplify/amplify-cli
Consistent and extreme amount of git conflicts on merge
- Dominant language
- TypeScript
- Stars
- 2.9k
- Forks
- 825
- Avg merge
- 11d 23h
- Merged PRs (30d)
- 2
Description
### Before opening, please confirm:
- [X] I have installed the latest version of the Amplify CLI (see above), and confirmed that the issue still persists.
- [X] I have [searched for duplicate or closed issues](https://github.com/aws-amplify/amplify-cli/issues?q=is%3Aissue+).
- [X] I have read the guide for [submitting bug reports](https://github.com/aws-amplify/amplify-cli/blob/master/CONTRIBUTING.md#bug-reports).
- [X] I have done my best to include a minimal, self-contained set of instructions for consistently reproducing the issue.
### How did you install the Amplify CLI?
npm
### If applicable, what version of Node.js are you using?
12.x
### Amplify CLI Version
5.3.0
### What operating system are you using?
mac
### Amplify Categories
function
### Amplify Commands
Not applicable
### Describe the bug
Our team has experienced a crippling number of git merge conflicts since migrating to amplify 5.x. The main conflicts are all surrounding the env field in the lambda layers key in the function params
```
{
"lambdaLayers": [
{
"type": "ProjectLayer",
"resourceName": "reportingShared",
"version": "Always choose latest version",
"isLatestVersionSelected": true,
"env": "CONFLICT IN THIS FIELD"
}
]
}
```
In our workflow, each dev has their own environment. We rebase from master, run "amplify env checkout ENV" and then develop, the merge conflicts arise when we land our PRs back onto master branch.
### Expected behavior
cleaner development experience with less conflicts, or a tool to help us resolve conflicts easier.
### Reproduction steps
use new layer versions in a multi env team.
### GraphQL schema(s)
```graphql
# Put schemas below this line
```
### Log output
```
# Put your logs below this line
```
### Additional information
_No response_
Contributor guide
Assessment
This issue has not been assessed yet.