Resolving conflicts in the Git plugin?
Posted: Wed Aug 07, 2019 5:10 pm
Hi all,
I'm testing the Git plugin (THANK YOU for making this!!) and I'm trying to figure out how server/local conflicts are resolved.
Starting out, the server and my local repo both have the following:
On the server, I successfully commit the following change:
In my local repo, I successfully commit the following change (note that the paragraph rewraps from the change):
When I do a push, I am told that I can't because my current branch is behind. This is expected.
When I do a pull to update my current branch, I get the following error:
I've made other simple changes without rewrapped paragraphs and they were successful, but this situation seems to put Oxygen and the Git plugin into an unresolveable state.
My expectation would be that the "Resolve Conflict" context menu item is selectable and allows me to resolve the differences versus the current server branch.
What's the proper workflow in this case?
I'm testing the Git plugin (THANK YOU for making this!!) and I'm trying to figure out how server/local conflicts are resolved.
Starting out, the server and my local repo both have the following:
Code: Select all
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt
ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation
ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
Code: Select all
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt
ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation
ullamco laboris nisi ut aliquip ***ADDED ON SERVER*** ex ea commodo consequat.</p>
Code: Select all
<p>Lorem ipsum ***ADDED LOCALLY*** dolor sit amet, consectetur adipiscing elit, sed do
eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
When I do a pull to update my current branch, I get the following error:
At this point I become stuck. The "Resolve Conflict" item in the Git Staging context menu is ghosted out and unselectable. If I choose "Open in compare editor", it shows me the old (pre-pull) server content on the right side and I'm unable to make any changes that resolve the conflict.Cannot pull. Your local changes to the following files would be overwritten by merge:
<test filename here>
I've made other simple changes without rewrapped paragraphs and they were successful, but this situation seems to put Oxygen and the Git plugin into an unresolveable state.
My expectation would be that the "Resolve Conflict" context menu item is selectable and allows me to resolve the differences versus the current server branch.
What's the proper workflow in this case?