Support for resolving conflicts when pulling from remote git branch. [INS-4550] #8118
Conversation
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
filfreire
force-pushed
the
feat/resolve-conflict-git-pull
branch
from
4787645 to
cb79001
Compare
yaoweiprc
force-pushed
the
feat/resolve-conflict-git-pull
branch
from
cb79001 to
4ebda98
Compare
filfreire
force-pushed
the
feat/resolve-conflict-git-pull
branch
from
4ebda98 to
259161b
Compare
Contributor
|
rebased with latest develop and fixed lint issue |
yaoweiprc
force-pushed
the
feat/resolve-conflict-git-pull
branch
2 times, most recently
from
f9783da to
9339772
Compare
Member
|
Could you add some description to let us know what changes were made? |
yaoweiprc
force-pushed
the
feat/resolve-conflict-git-pull
branch
from
a41d721 to
4e49ff7
Compare
gatzjames
previously approved these changes
Oct 31, 2024
Contributor
|
Did some testing and it works great! LGTM! Next steps for Git:
|
CurryYangxx
reviewed
Nov 1, 2024
| remote: 'origin', | ||
| singleBranch: true, | ||
| }).catch( | ||
| async err => { |
Member
There was a problem hiding this comment.
I suggest that the logic in catch can be split into several separate functions. The current function is too long and difficult to read.
CurryYangxx
reviewed
Nov 1, 2024
| commitMessage: string; | ||
| commitParent: string[]; | ||
| }) { | ||
| console.log('[git] continue to merge after resolving merge conflicts', await this.getCurrentBranch()); |
Member
There was a problem hiding this comment.
Does this log need to be deleted?
Contributor
Author
There was a problem hiding this comment.
We do need this log.
yaoweiprc
force-pushed
the
feat/resolve-conflict-git-pull
branch
from
4e49ff7 to
ff49aac
Compare
CurryYangxx
approved these changes
Nov 5, 2024
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.
Changes:
pulling from remote branch.