Conversation
Add Freeze On/Off for projects
|
weiwei, the pull request has conflict. Can you resolve the conflict then do a pull request? To resolve the conflict, you will normally pull the latest from the master stream first, then make changes. It seems to me that you made your changes based on an earlier version of the master stream. |
|
I am not sure, how should I fix it. Could you tell me how? |
|
Go into your local repository and undo the changes you've made so far with This will delete any changes you've made! You should probably copy the modified files so you can make the changes again later. Your repository will be synchronized to the current upstream master, overwriting the changes you've made. You can then make the changes on top of the latest code. After that, re-commit and push to your feature branch and we should be able to see the merge conflict disappear. If you have errors pushing, you may need to overwrite your local repository changes by using the |
|
weiwei, there are 2 bugs in the patch set.
I have corrected the problems and incorporated the changes into the latest patch set. Thus this patch set will be abandoned. |
Add Freeze On/Off for projects