Skip to content

Conversation

@edgarriba
Copy link
Contributor

No description provided.

@alalek
Copy link
Member

alalek commented Nov 23, 2015

Please remove unnecessary intermediate changes like removed files (squash commits into one: git rebase -i upstream/master)

@edgarriba
Copy link
Contributor Author

@alalek not sure if I messed up ...

@alalek
Copy link
Member

alalek commented Nov 23, 2015

I have no idea how you get this =)
Merge commits in patch is evil.

git remote add upstream https://github.com/Itseez/opencv_extra.git
git fetch upstream
git checkout sfm
git rebase -i upstream/master
# "pick" first commit and "f" for others, save+exit
git push -f origin sfm

adding test data for sfm module

adding sfm module test data

removing sample file

removing blender scene generator

adding test data for sfm module
@edgarriba
Copy link
Contributor Author

before I put s instead of f

@opencv-pushbot opencv-pushbot merged commit ab5e555 into opencv:master Dec 10, 2015
vpisarev added a commit that referenced this pull request Dec 10, 2015
@edgarriba edgarriba deleted the sfm branch January 19, 2016 13:50
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.

3 participants