DaanHoogland commented on pull request #4230: URL: https://github.com/apache/cloudstack/pull/4230#issuecomment-929003300
> > @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. yes, @weizhouapache is right, I think you better remove local branches `reset_cfg` and `main`. next ``` git fetch origin git fetch upstream git checkout -b main upstream/main git checkout -b reset_cfg origin/reset_cfg git rebase main ``` your original plan to, ``` git fetch upstream git rebase upstream/main git checkout reset_cfg git rebase main ``` , should have worked unless you had leftovers that were in the way, or not the latest of either repo, which might have caused a conflict. Have a look at `git rebase --help`, it is easy to mess up a bit, but hard to cause real damage, don't worry(, be happy). -- 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]
