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

Develop rename update #642

Closed
wants to merge 8 commits into from

Conversation

mgage
Copy link
Sponsor Member

@mgage mgage commented Sep 29, 2015

version of rename update pull request being made to release-2.11. As far as I can tell this is clean and only changes the files that I changed to update the develop branch.

I didn't figure out how to use rebase to change my laptop version of release-2.11 to include the recent changes. I'll be happy for some hints about how to do that.

In particular don't update in retitleCourse if the box is not checked even if there is an entry in the box.
Still need to verify this when the course is actually renamed
Need to  improve the report messages to say the previous values of title and institution
Next step will be to add information about previous values when the values are changed.
@goehle
Copy link
Member

goehle commented Sep 29, 2015

This is a pull from a branch off of develop into 2.11. In general this is bad, but because 2.11 got split off of develop after this branch, and since this branch hasn't had develop pulled back in recently, its probably OK.

The better thing to do would be to rebase this branch to release-2.11 using

git rebase --onto origin/release-2.11 origin/develop develop_rename_update

@mgage
Copy link
Sponsor Member Author

mgage commented Sep 30, 2015

replace with clean version from release-2.11

@mgage mgage closed this Sep 30, 2015
@mgage mgage deleted the develop_rename_update branch November 22, 2015 19:52
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.

None yet

2 participants