tests: Add a test for sync with potential conflicts#25
Closed
carlosfg-flu wants to merge 1 commit into
Closed
Conversation
This is an scenario where GUW sync command raises some git conflicts that are avoidable: * 0632076 (HEAD -> A) foo | * b1ac2a0 (B) bar | * fd1dd3f foo |/ * 5ccd4f9 (main, final) init 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: git rebase origin/A B --onto=final 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: git rebase B~ B --onto=final
c3c7f83 to
3e678a0
Compare
Author
|
When a feature, let's say feature1, enters into reviewing mode due to a merge request, gitGraph TB:
commit
commit
branch feature1
commit
So this scenario won't be possible if the workflow is followed correctly. PS: We might want to use this way of testing, with a locally generated git repo, instead of polluting the GUW official repository with testing inmortal branches. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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: