Warning: Multiple merge bases detected. The list of commits displayed might be incomplete

I've run through the same issue in AWS and our pipele. We are transitioning to git-actions. Our terraform is using dynamodb as its lockstate persistence and s3 to hold the actual terraform statefile. When I looked at the lock state in the dynamodb, the md5 digest column is empty and the key did not indicate and -md5, just a normal .

What does this mean?

Note: Do not try this if you are not familiar with Terraform State File.

ble. Rename the old lockstate to a different key so that it wont be searched up.

What I did is I cloned the said lockstate and renamed to -md5. Look at my s3 statefile for the hashkey and copy it over to the digest column in dynamo table. Rename the old lockstate to a different key so that it wont be searched up.

That's it for me.

That's it for me.

Again, this may not work for everybody but this worked for me.

50375 次浏览
小开

I ran into the same issue when i was using terraform with S3 and dynamodb backend

All the permissions, with examples, are listed in the Terraform S3 backend documentation:

https://www.terraform.io/language/settings/backends/s3

小开

Reason : i forcefully terminate apply process that actually prevents me to aquire the lock again

I got the same message today. I just pulled the latest changes from the destination branch and merged them in the source branch and the issue was resolved.

小开

Try listing the terraform processes currently active and kill them

小开

I had this happen to multiple teammates today. It was occurring because they were about to merge a PR into our main branch before merging that main (remote) branch into their (local) branch first. Their local branch was several commits behind.

Once they merged, committed, and pushed, the message disappeared.

arge numbers of tests? Having flexibility in writing tests is also important to us since our functional tests cover a wide aspect and need to be written in a variety of ways to get results.

At work we are currently still using JUnit 3 to run our tests. We have been considering switching over to JUnit 4 for new tests being written but I have been keeping an eye on TestNG for a while now. What experiences have you all had with either JUnit 4 or TestNG, and which seems to work better for very large numbers of tests? Having flexibility in writing tests is also important to us since our functional tests cover a wide aspect and need to be written in a variety of ways to get results.

Old tests will not be re-written as they do their job just fine. What I would like to see in new tests though is flexibility in the way the test can be written, natural assertions, grouping, and easily distributed test executions.

小开

If I am correct, this warning is useless, because Azure DevOps also has a feature to detect merge conflicts. And I am getting this warning no matter if there are any conflicts or not:

Enter image description here

If there are merge conflicts detected, then I get this one:

Enter image description here

First I would say, don't rewrite all your tests just to suit the latest fad. Junit3 works perfectly well, and the introduction of annotations in 4 doesn't buy you very much (in my opinion). It is much more important that you guys write tests, and it sounds like you do.

So I would say the proper way to handle merges is by automatic build pipeline, not a warning that confuses everybody.

小开

Use whatever seems most natural and helps you get your work done.

This can sometimes happen if your merge is set to "fast-forward" when you have more than one branch implicated, as per the message.

If there are no other conflicts (check Conflicts tab) then you can probably allow the merge to Complete, by selecting (from "..." menu) Restart Merge, then choosing the non fast-forward merge option.

小开

TestNG has a neat feature where you can mark tests as a particular group, and then easily run all tests of a specific group, or exclude tests of a particular group. Thus you can mark tests that run slowly as in the "slow" group and then ignore them when you want quick results. A suggestion from their documentation is to mark some subset as "checkin" tests which should be run whenever you check new files in. I never saw such a feature in JUnit, but then again, if you don't have it, you don't REALLY miss it.

For all its claims of high configuration, I did run into a corner case the a couple weeks ago where I couldn't do what I wanted to do... I wish I could remember what it is, but I wanted to bring it up so you know that it's not perfect.

About a year ago, we had the same problem. I spent sometime considering which move was better, and eventually we realized that TestNG has no 'killer features'. It's nice, and has some features JUnit 4 doesn't have, but we don't need them.

The biggest advantage TestNG has is annotations... which JUnit added in version 4 anyways.

小开
  • If not, then create a new branch from the origin of the destination, cherry pick all the commits which are relevant and commit push. Create a new PR from this new branch.

    • TestNG's biggest draw cards for me include its support test groups, and more importantly - test group dependencies (marking a test as being dependent of a group causes the tests to simply skip running when the dependent group fails).

    Choose the option based on your feasibility.

    小开

    This is Azure's way of alerting you to verify and make sure you have not neglected to merge a pull request; it typically occurs when you have an abandoned pull request in the source branch or a previous branch in the tree.

    小开

    TestNG's other big draw cards for me include test parameters, data providers, annotation transformers, and more than anything - the vibrant and responsive user community.

    I had to merge latest 'main' in to my 'features/x' branch. The 'features/x' branch was protected, requiring a pull request. The PR had to be completed with fast forward merge. I was trying squash merge, and the 'features/x' branch was not picking up the full commit history. Turns out the directionality of squash merge is something to pay close attention to.


    提交答案