weizhouapache edited a comment on pull request #4230: URL: https://github.com/apache/cloudstack/pull/4230#issuecomment-928260282
> > @weizhouapache that is resulting in conflict in unrelated files @ravening it might be cause your directory is not clean, for example there are some untracked file, uncommitted changes, etc you can remove local branch `reset_cfg`, then checkout it again. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
