search

hipspy / hips

Python library to handle HiPS
https://hips.readthedocs.io
13 stars 16 forks source link

Sphinx update #13

Closed adl1995 closed 7 years ago

adl1995 commented 7 years ago

I used git reset --soft HEAD~12 to merge the previous 12 commits. Only the index.rst file is updated in this pull request.

cdeil commented 7 years ago

Diff looks good.

There's still a merge commit here that's not really nice: https://github.com/hipspy/hips/pull/13/commits

Do you want to try and get rid of it? Or should I merge now?

adl1995 commented 7 years ago

Apparently I had to delete the branch as Git wouldn't allow me to push after squashing previous commits as it was a commit behind the remote branch.

cdeil commented 7 years ago

You always have to use git put -f (force push) after you change commits locally (e.g. with git rebase or git reset), i.e. every time the push "destroys" commits on the server. That's normal, I do it every day when I rebase my commits and clean up my git commit history for a given pull request, before merging it. But you have to be careful / know what you're doing, because git rebase, git reset and git push -f have the potential to really loose edits / commits if you screw up.

coveralls commented 7 years ago

Coverage Status

Coverage remained the same at 100.0% when pulling 3d428bc126e6f8e9ec12290d0d3897c3f863ff9b on adl1995:sphinx-update into e223093605b1de014bf2457040e44d54bce2e81a on hipspy:master.

adl1995 commented 7 years ago

Thanks!

I now have two commits, namely "Merge branch 'master' of https://github.com/hipspy/hips into sphinx-update" and "Shpinx docs update" and I wish to merge them into a single commit.

I'm following this SO answer and issuing this command git reset --soft HEAD~2, but when I do this the pull from master is lost. Is there any alternative way for merging together 2 commits?

cdeil commented 7 years ago

I'm usually using git rebase -i master to rebase against the latest master and clean up my commit history for a given branch. Can you try that?