tests: Add a test for sync with potential conflicts #25
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an scenario where GUW sync command raises some git conflicts that
are avoidable:
In this scenario the branch A was rebased, hypothetically because a
reviewed asked for a change. Then, when we try to "sync" with GUW, it
launches the command:
The range "origin/A..B" is wrong, the correct one should be "B~..B" because
it includes only the commits within the "B" branch. This command
doesn't raises conflicts and gives the expected result: