Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some things are ready #8

Merged
merged 5 commits into from
Jan 26, 2019
Merged

Some things are ready #8

merged 5 commits into from
Jan 26, 2019

Conversation

sancho11
Copy link

@sancho11 sancho11 commented Jan 26, 2019

-Fixed Scroll reducer.
-Some functions were broken down into simpler functions, to facilitate the reading of the code.
-The spanish comments were changed to english
-Some variables like cursera or curseraf now have names that give meaning to what they are.

I'm not sure if I did the pull request correctly

New navigation features added too.
almost the same features for arduino MEGA, now for arduino UNO!
Added a way to every board work with a single one processing code.
-Fixed Scroll reducer.
-Some functions were broken down into simpler functions, to facilitate the reading of the code.
-The spanish comments were changed to english
-Some variables like cursera or curseraf now they have names that give meaning to what they are.
@aster94 aster94 changed the base branch from new-features to master January 26, 2019 10:48
@aster94 aster94 changed the base branch from master to new-features January 26, 2019 10:49
@aster94
Copy link
Owner

aster94 commented Jan 26, 2019

yepppp that is strange! i don't know exactly what happened but the PR is not correct, i will merge it anyway but it show too much changes 🤔

Just to be sure, which git command are you using to download the branch new features and to push to it?

@aster94 aster94 changed the base branch from new-features to pr January 26, 2019 10:56
@aster94 aster94 merged commit b8496ee into aster94:pr Jan 26, 2019
@aster94
Copy link
Owner

aster94 commented Jan 26, 2019

edit: there where a lot of merge conflict and i had to create a new branch to merge the pull request

@aster94
Copy link
Owner

aster94 commented Jan 26, 2019

i found out what happened!

see the commist list between your repo
https://github.com/sancho11/logic-analyzer/commits/new-features
and mine
https://github.com/aster94/logic-analyzer/commits/new-features
you will see that there are the same untill Jan 16, 2019
then on Jan 19, 2019 i bring your changes in my repo with c7eee4c (#6)
but then i make a few commits
4410b42
719be84
82bbeac
which you forgot to bring in your repo, to correctly merge this you should have mantain your repo updated!

I guess you are new to git so don't worry, it is a wonderful tool but is quite complicated, i am starting understang it only now 😥

if you go to your repo in the branch new features do you see anything like "update this branch from aster:new-features"?

I guess you did something like this: you downloaded the branch new-features from my repo and from it you started adding the changes then uploaded all in your repo and you made the pull request, correct?

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.

2 participants