Next #424

Closed
wants to merge 5 commits into
from

Conversation

Projects
None yet
5 participants

Hello,


Request pull for the commit "Slider Next Branch"

This is a commit that I did in the bbUI project for the "Slider application", all the methods added ( For example: hideSlider(), showSlider(), removeSlider(), enableSlider(), disableSlider() ) or the changements effectuated will favorise the use of the Slider application in BlackBerry10, the slider is used to change the appearance of the image from the darkest version to the luminous version, multiple options are available on this application.

All the functions are tested, they are functioning very well but please let me know if every thing is OK.

Member

tneil commented Oct 26, 2012

It looks like this is using the 0.9.4.js files.. You'll need to grab the latest from the next branch and then re-add your changes to the new 0.9.5.js/css file

But when I'm cloning the file from bbUI.js, I'm not getting the 0.9.5.
files, what I'm getting is the oldest one, you can see that on the print
screen in the attachment.

When I grab the bbUI from the next branch, I'm getting the oldest 0.9.4.js/css, not the newest 0.9.5.js/css is that normal ??

Contributor

karancan commented Oct 30, 2012

It can't function Khiani cause this is a blackberry next, I need an
advisor to update the sekkalhidaya next witch is private, different
version of js/css cause fatal errors.

Try this link: https://github.com/blackberry/bbUI.js/tree/next/samples
It has 0.9.5


Reply to this email directly or view it on GitHub:
#424 (comment)

Hidaya Sekkal

Contributor

karancan commented Oct 30, 2012

Why don't you just download the 0.9.5 version onto your local machine, then commit and push the changes to your remote repo and then your next will be up to date with bbUI next.
Alternatively, set your upstream to bbUi next and then "pull" all changes from upstream and push them to your remote.

It's a necessity to do the clone, it can't function with the download.
And I already tried it, it doesn't function.

Contributor

karancan commented Oct 30, 2012

Provided you have "upstream" pointing to https://github.com/blackberry/bbUI.js.git and you have the correct branch checked out (in this case "next"), you need to enter the following steps:

git fetch upstream
git pull upstream next

Now it will try and update your local files. In your case, your files are not up to date, so it will update them and in the case that it cannot, it will tell you which files it cannot update. Then, you go into each of the files that could not be automatically merged and fix the conflicts. Once you have finished solving the conflicts, you can do:

git commit -a

Enter a comment for the changes that apply to this commit

git push

Pushes the changes to your remote repo as well as this pull request. And then you're done!

Kiran I already tried that it doesn't work, the issue is not at all
comming from the blackberry next, it's in the merge so I need one of the
advisor to update the sekkalhidaya next, like what they did on the master.

I tried to did the changement, but when I do the pull upstream the merge
fail you can see that on the print screen in attachment (if you can give
me your email I can send to you the print screen, cause the attachment is
not supported in comments), I think that he needs to remove the old file
from sekkalhidaya next repository.

I'm getting errors on the 0.9.5.js file, when I do the "git pull upstream next" you will find in the attachment the file with the errors.

sekkalhidaya reopened this Oct 30, 2012

Contributor

karancan commented Oct 30, 2012

1- He cannot remove files from your repo. It is your repo and only you can change it.
2- When the merge fails, it is because there is a conflict...you need to go into the conflicted files and fixed them.

Member

tneil commented Oct 30, 2012

One brute force way of getting back in sync is by making a backup of your changes, then delete your fork in github and re-fork the project.

Apply your changes and then send the pull request

Member

timwindsor commented Oct 30, 2012

This guide should help you with the conflict resolution: http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging#Basic-Merge-Conflicts

This is a normal operation with version control. There are some differences between your files and the ones that are trying to be merged in and it can't be resolved automatically.

sekkalhidaya Merge branch 'next' of https://github.com/blackberry/bbUI.js into next
Conflicts:
	samples/bbui-0.9.5.css
	samples/bbui-0.9.5.js
48a75b7
Owner

sekkalhidaya commented on 48a75b7 Nov 12, 2012

This commit contains the new version of the bbUI.js after the merge.
The slider application was updated in this code, I added the following methods: disableSlider(), enableSlider(), removeSlider(), showSlider(), moveSlider().

Is every thing Ok or you need me to do an other commit?

Owner

sekkalhidaya replied Nov 12, 2012

I need that you remove the existing pull request from the next branch sekkalhidaya to the next branch Blackberry, please, cause I'm not able to do an other one.

The merge between the two versions was successful, I did a commit, this is
the hyperlink for the pull request of the commit:

https://github.com/blackberry/bbUI.js/pull/424/commits

Member

tneil commented Dec 6, 2012

Hi @sekkalhidaya, in order for the pull request to be updated you will have to commit your changes and update this pull request. I can't merge the request because github says that it cannot be automatically merged.

I would suggest syncing up your repo with the latest from the next branch and then submitting a pull request with your changes

OK, I will redo the Commit and the pull request again to be synchronize my
repository.

Regards,
Thanks.

Hi @sekkalhidaya, in order for the pull request to be updated you will
have to commit your changes and update this pull request. I can't merge
the request because github says that it cannot be automatically merged.

I would suggest syncing up your repo with the latest from the next branch
and then submitting a pull request with your changes


Reply to this email directly or view it on GitHub:
#424 (comment)

Hidaya Sekkal

Member

tneil commented Dec 10, 2012

I'm going to close this pull request.. The next branch will be going away tonight. I would recommend syncing with master tomorrow and then doing a pull request to master.

tneil closed this Dec 10, 2012

I did a commit and a pull request but I don't find it to synchronized it
with the master branch.

I'm going to close this pull request.. The next branch will be going away
tonight. I would recommend syncing with master tomorrow and then doing a
pull request to master.


Reply to this email directly or view it on GitHub:
#424 (comment)

Sekkal Hidaya

Member

tneil commented Dec 11, 2012

We have closed down the "next" branch.. You will have to sync up with the latest in the master branch, make your changes and send a new pull request.

I did a pull request in the master branch for the slider apps.

I wanted also to do a commit in the master branch for the toggle
application, but the code of the toggle apps in the master branch doesn't
work even that it works in the next branch version, is that normal, should
I add more methods.

Member

tneil commented Dec 12, 2012

I've tested the toggle buttons in the master branch this morning and they seem to be working fine. There isn't a "next" branch any more in this repository. I have a feeling your Fork is out of sync with the latest code in this repo

You mean for the slider application, I really synchronized it with the
master branch and I resolved the conflict, the synchronization was
successful and the slider features was functioning very well.

Ok, for the toggle buttons I will review my code.

Regards.

Tim Im confuse with the NEXT branch closed... in the pass we have the last for production and the next for the developer time and was clear that next is in test... how is it today? Should i need to version myself ?
Thanks

Hello,

You will have to sync up all your code with the latest version in the master branch and make a pull request, if it's not already done.

Member

tneil commented Dec 14, 2012

@gcsantiago The next branch is gone. All older versions of bbUI are tagged in the master branch. The master branch is now our "next" branch. Reality is that the next branch was very rarely unstable and actually had all of the latest best updates.

I've updated the Jake file, so what it does now on every commit or accepted pull request, I run the jake file and it increments the version stamped inside the bbUI js/css files

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