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

7.x islandora 1023 #114

Merged
merged 2 commits into from
Sep 8, 2014
Merged

7.x islandora 1023 #114

merged 2 commits into from
Sep 8, 2014

Conversation

ruebot
Copy link
Member

@ruebot ruebot commented Aug 11, 2014

No description provided.

@willtp87
Copy link
Member

Looks like there is a commit here form #113 ?

@ruebot
Copy link
Member Author

ruebot commented Aug 12, 2014

Yeah. They're getting mushed together even though they're separate branches. Not sure why.

@willtp87
Copy link
Member

It looks like you didn't use a topical branch for #113 so if you created this branch off of your 7.x it would contain the irc commit, this could be handled by branching off of 7.x again and hard resetting to HEAD^1 before making your changes (probably cherrypick from this branch) to the new branch.

@ruebot
Copy link
Member Author

ruebot commented Aug 12, 2014

Well, there a few of these in the 36 or so pull requests that I did yesterday. So, we'll have to decide whether or not the irc notifications are fine or not. If not, I guess somebody else will have to take care of 1023.

willtp87 added a commit that referenced this pull request Sep 8, 2014
@willtp87 willtp87 merged commit 63bfc50 into Islandora:7.x Sep 8, 2014
@willtp87 willtp87 mentioned this pull request Sep 8, 2014
bondjimbond pushed a commit to bondjimbond/islandora_solution_pack_collection that referenced this pull request Sep 21, 2020
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