Stream: committers
Topic: vscache conflict
John Moehrke (Apr 06 2021 at 00:34):
Is there any easy way to handle a pull-request that has a conflict with a vscache file? Can't I just tell the pull-request to use mine?
Lloyd McKenzie (Apr 06 2021 at 01:51):
Depends on what Git tool you're using, but yes, you should be able to
John Moehrke (Apr 06 2021 at 11:20):
I am a tortoiseGit user. but am willing to do commandline. The thing that is holding me back is lack of confidence of what I am doing with Git.
Vassil Peytchev (Apr 06 2021 at 13:54):
Does TortoiseGit have "resolve Conflicts" -> "Use Mine" somewhere in its menus?
John Moehrke (Apr 06 2021 at 14:02):
It has a "Resolve..." menu. when I select that it says that there are none.
Vassil Peytchev (Apr 06 2021 at 14:23):
Did you do pull master/merge master into your branch first?
John Moehrke (Apr 06 2021 at 14:36):
I had pulled master, before creating my branch. But while I was working on my branch, others updated master.
Vassil Peytchev (Apr 06 2021 at 15:00):
That is why after you finish work on your branch you pull master again, and merge it into your branch, just before you push your branch to GitHub. This way you resolve conflicts locally, and the PR should show no issues.
John Moehrke (Apr 06 2021 at 15:12):
I tried to do that. I got a message that my remote repo was not found. so I pushed it.. and that is where I am now.
John Moehrke (Apr 06 2021 at 15:13):
I might have created the pull request too soon? Can I un-create the pull request?
Bryn Rhodes (Apr 06 2021 at 15:14):
Yes, you can just close the PR, it won't affect your branch
John Moehrke (Apr 06 2021 at 15:30):
I suspect there are many ways t get out of this situation.. I am NOT smart enough. I need someone to guide me. .. I don't git git well enough
Bryn Rhodes (Apr 06 2021 at 15:37):
Since committers merge their own PRs, you don't have to close it, you can continue to commit changes to that branch until you are ready, then once it passes all the build checks, you can merge it.
John Moehrke (Apr 06 2021 at 15:39):
understood. so how do I get the current master onto my local repo branch?
John Moehrke (Apr 06 2021 at 15:39):
so that I can then push that to my cloud branch, and move the pull-request along
Vassil Peytchev (Apr 06 2021 at 15:50):
How did you start your work? Did you clone master locally, and then create a branch locally? If you did that, on the command line, git branch will show you the branches that you have locally. Do you see master and your branch?
John Moehrke (Apr 06 2021 at 16:01):
yes I have both master and security-CR
Vassil Peytchev (Apr 06 2021 at 16:11):
Then the following should get you there:
git checkout master
git pull origin master
git checkout security-CR
git merge --no-ff master
Assuming, of course, that you don't get any errors...
John Moehrke (Apr 06 2021 at 16:14):
the first three commands succeeded
John Moehrke (Apr 06 2021 at 16:14):
the last one failed "Automatic merge failed; fix conflicts and then commit the result."
John Moehrke (Apr 06 2021 at 16:16):
I do now see something in tortoise when I select the resolve menu
John Moehrke (Apr 06 2021 at 16:20):
I proceeded to resolve with totoise. I then followed the recommendations it gave me... so I might be unstuck.
Vassil Peytchev (Apr 06 2021 at 16:21):
Make sure you commit to your branch after you resolve. Then push your branch to origin...
John Moehrke (Apr 06 2021 at 16:23):
I don't show anything to push.. so I think totroise did recommend the right steps to me... possibly
John Moehrke (Apr 06 2021 at 16:30):
so... that didn't fully work... I now have a build failure in the cloud on validation
Load Terminology Cache from /home/markiantorno/azure-pipelines/_work/2/s/vscache 0.736 3sec 141MB
ERROR: Unable to process warnings: /home/markiantorno/azure-pipelines/_work/2/s/publish/warnings.xml (No such file or directory)
java.io.FileNotFoundException: /home/markiantorno/azure-pipelines/_work/2/s/publish/warnings.xml (No such file or directory)
John Moehrke (Apr 06 2021 at 16:31):
doing a clean build locally, now....
John Moehrke (Apr 06 2021 at 16:33):
nope. that fails now too
Vassil Peytchev (Apr 06 2021 at 16:34):
What happens if you locally do
git commit -am "attempt to fix"
John Moehrke (Apr 06 2021 at 16:39):
I get a response "nothign to commit, workign tree clean"
John Moehrke (Apr 06 2021 at 16:41):
is there a way to re-create the all-systems.cache?
John Moehrke (Apr 06 2021 at 16:43):
at this point... I feel I should just clone master fresh and make my changes for security all over again. This is amazingly frustrating
Vassil Peytchev (Apr 06 2021 at 16:47):
If you can wait until 1-ish, I can get on Webex with you to see if this can be resolved.
John Moehrke (Apr 06 2021 at 16:50):
Ill take you up on that
Vassil Peytchev (Apr 06 2021 at 16:54):
Webex sent
Last updated: Apr 12 2022 at 19:14 UTC
