Easily find issues by searching: #<Issue ID>
Example: #1832
Easily find members by searching in: <username>, <first name> and <last name>.
Example: Search smith, will return results smith and adamsmith
| Dev |
|
| QA |
|
| Priority | Minor |
| Complexity | Unknown |
| Component | App - Version Control - GIT |
| Version | Future |
Issue with ADS basic merge conflict : <<<<<<< HEAD", "=======" and ">>>>>>>" separators
ADS
When there is a conflict in merge between branches ADS displays a dialog as attached, but no standard conflict-resolution markers are added to the files in the branches. This makes it hard for users to edit the files and merge.
git tool
When there is a conflict in merge between branches users needs to manually fix the conflict and then perform the merge. The git tool will add standard conflict-resolution markers to the files that have conflicts, so users can open them manually and resolve those conflicts.
For e.g
<<<<<<<HEAD:index.html<div id="footer">contact : email.support@github.com</div>=======<div id="footer">please contact us at support@github.com</div>>>>>>>>iss53:index.html
This means the version in HEAD (your master branch, because that was what you had checked out when you ran your merge command) is the top part of that block (everything above the =======), while the version in your iss53 branch looks like everything in the bottom part. In order to resolve the conflict, you have to either choose one side or the other or merge the contents yourself.
Refer: https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging#Basic-Merge-Conflictshttps://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging#Basic-Merge-Conflicts
Dear Tariq,
Could you please add that screenshot. It seems to be missing.
Dear Asif,
Can you please layout a requirement for this issue ? Do you want us to add these markers and then display a merge-conflict dialog and let user perform operations like the mergetool of GIT does ? or simply add these markers ? From where and how does the current system work ?
Also, is "eclipse-jgit" and com.common.vcontrol the right place to start looking at this ?
best regards,
Vikram
I have tested it locally in ADS-18-devi-241 build. Created Git master and branch repos of Aqua script project. When we merge master with branch in ADS Git, Merge conflict message dialog displayed as attached MergeConflictDialog.png and in conflicted file conflict- resolution markers are added, please see attached Conflict_Resolution_Marker.PNG. I think this is correct and expected behavior.
Is my understanding correct or am I missing something to reproduce this issue ?
I have tested it locally in ADS-18-devi-241 build. Created Git master and branch repos of Aqua script project. When we merge master with branch in ADS Git, Merge conflict message dialog displayed as attached MergeConflictDialog.png and in conflicted file conflict- resolution markers are added, please see attached Conflict_Resolution_Marker.PNG. I think this is correct and expected behavior.
Is my understanding correct or am I missing something to reproduce this issue ?
Can you please layout a requirement for this issue ? Do you want us to add these markers and then display a merge-conflict dialog and let user perform operations like the mergetool of GIT does ? or simply add these markers ?
We need to have the conflict markers (<<<<<<<, =======, and >>>>>>>) in the merged file so that user can manually resolve the conflicts.
From where and how does the current system work ? Also, is "eclipse-jgit" and com.common.vcontrol the right place to start looking at this ?
You need to start looking into [aqua-gitadmin] module. You may want to start looking into class com.common.vcontrol.git > GitClient.
You need [aqua-gitadmin] module to work on this issue.
Can you please layout a requirement for this issue ? Do you want us to add these markers and then display a merge-conflict dialog and let user perform operations like the mergetool of GIT does ? or simply add these markers ?
We need to have the conflict markers (<<<<<<<, =======, and >>>>>>>) in the merged file so that user can manually resolve the conflicts.
From where and how does the current system work ? Also, is "eclipse-jgit" and com.common.vcontrol the right place to start looking at this ?
You need to start looking into [aqua-gitadmin] module. You may want to start looking into class com.common.vcontrol.git > GitClient.
You need [aqua-gitadmin] module to work on this issue.
Issue #14466 |
| New |
Completion |
| No due date |
| No fixed build |
| No time estimate |
Dear Tariq,
Could you please add that screenshot. It seems to be missing.
Dear Asif,
Can you please layout a requirement for this issue ? Do you want us to add these markers and then display a merge-conflict dialog and let user perform operations like the mergetool of GIT does ? or simply add these markers ? From where and how does the current system work ?
Also, is "eclipse-jgit" and com.common.vcontrol the right place to start looking at this ?
best regards,
Vikram