8000 Use canonical names by naixx · Pull Request #453 · androidannotations/androidannotations · GitHub
[go: up one dir, main page]

Skip to content
This repository was archived by the owner on Feb 26, 2023. It is now read-only.

Conversation

@naixx
Copy link
Contributor
@naixx naixx commented Jan 8, 2013

This is a small pull request to eliminate hardcoded type names. Probably, some other names should be replaced or added.

@mathieuboniface
Copy link
Contributor

Hi @naixx,

That's a really good idea :)

I see 5 commits in this PR, only one is related to your changes.

Could you make a new PR that only include your changes in order to simplify the review ? :)

@naixx
Copy link
Contributor Author
naixx commented Jan 12, 2013

@mathieuboniface can you give an advice, how to do it? Overall changes concern only PR. While merging this PR can we make it as one commit?

@mathieuboniface
Copy link
Contributor
# Add the excilys repo to your remotes
git remote add excilys https://github.com/excilys/androidannotations.git
git fetch excilys
# Checkout the last revision on excilys/develop as a new branch
git checkout -b use_canonical_names2 excilys/develop
# Pick the change in the new branch
git cherry-pick b1cd2e814b7b455e35c926a0ab1c5dc7583fe46c
# Push to your repo in order to make new PR
git push origin use_canonical_names2

I'm not sure it is the best way to do, but it should work :)

@naixx
Copy link
Contributor Author
naixx commented Jan 13, 2013

Thank you @mathieuboniface! As I understood, this script transfers one commit to another clean branch. But there may be a problem, that my develop branch has all these garbage merge commits, and I branched from it for 434. So, is there any way to combine|squash commits in my develop? Can it be cleaned some way?
So, overall changes will be fine, but nevertheless

@naixx
Copy link
Contributor Author
naixx commented Jan 14, 2013

Challenge finished via! Now, trying to fix my develop :)

mathieuboniface added a commit that referenced this pull request Jan 14, 2013
@mathieuboniface mathieuboniface merged commit 2bc991c into androidannotations:develop Jan 14, 2013
@naixx naixx deleted the use_canonical_names branch January 14, 2013 13:21
@pyricau
Copy link
Contributor
pyricau commented Feb 27, 2013

This pull request should be linked to a milestone. I did a

$ git branch --contains de1874b
* develop

So it appears this commit is only on develop right now, so this will be for 3.0

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

0