codestream icon indicating copy to clipboard operation
codestream copied to clipboard

Unable to amend a feedback request after a merge

Open pepijnve opened this issue 4 years ago • 4 comments

I started a feedback request from a feature branch. I made couple of extra commits, then merged in the integration branch and then made some additional commits. I'm now trying to amend the feedback request with additional commits, but the UI is stuck "Loading repo info". In Activity Monitor I can see the CodeStream sub process spawning short-lived git subprocesses, so it's still doing something, but it doesn't look like it's going to finish anytime soon. Is there any way to monitor what's going on via log files for instance?

pepijnve avatar Feb 11 '21 16:02 pepijnve

@pepijnve - We're definitely aware of some issues around when you try to amend a review after merging another branch, and we are working on it. To help in that effort, could I trouble you for a log file? Instructions for grabbing them can be found at the following link. Note that we just need the Agent log in this case. Thanks!

https://docs.codestream.com/userguide/faq/client-logs/

planteater avatar Feb 11 '21 18:02 planteater

Of course. I'll dig up those logs for you tomorrow.

pepijnve avatar Feb 11 '21 19:02 pepijnve

@planteater here you go. The plugin seems to be stuck in a loop, querying the diff for the same commit over and over again. idea.log.zip

I can provide you with more details on the commits in question via email if necessary.

pepijnve avatar Feb 12 '21 08:02 pepijnve

@planteater , curious about whether the issues around amending after merge has been resolved? I seem to be having the same problem at the moment...

hennidk avatar Jun 09 '21 12:06 hennidk