Skip to content

Update avconfig.json#1

Open
williamchen2 wants to merge 1 commit intolitong01:masterfrom
williamchen2:patch-2
Open

Update avconfig.json#1
williamchen2 wants to merge 1 commit intolitong01:masterfrom
williamchen2:patch-2

Conversation

@williamchen2
Copy link

Add Freeze On/Off for projects

Add Freeze On/Off for projects
@litong01
Copy link
Owner

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.

@williamchen2
Copy link
Author

I am not sure, how should I fix it. Could you tell me how?

@alebcay
Copy link
Collaborator

alebcay commented Oct 20, 2015

Go into your local repository and undo the changes you've made so far with

git remote update
git reset --hard origin/master --

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 -f flag when pushing:

git push -f origin patch-2

@litong01
Copy link
Owner

weiwei, there are 2 bugs in the patch set.

  1. freeze on and off code do not have the CKS byte. It has to be calculated, without CKS byte, the command will be considered invalid, they will not work.
  2. projector_front_center freeze on and off have exactly same code which is not correct.

I have corrected the problems and incorporated the changes into the latest patch set. Thus this patch set will be abandoned.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants