search

xunhuang / covid-19

MIT License
17 stars 16 forks source link

Footer #94

Closed tumbleshack closed 4 years ago

xunhuang commented 4 years ago

Thanks for the feedback. can you please

1) create a separate Pull request for this? the flow that I have seen worked well is create a pull request for each change. it's easier to manage over time as we don't have to deal with stacking too many changes together.

2) for the popup, I was more thinking about this one: https://codesandbox.io/s/yiwhw

tumbleshack commented 4 years ago

Thanks for the feedback. can you please

  1. create a separate Pull request for this? the flow that I have seen worked well is create a pull request for each change. it's easier to manage over time as we don't have to deal with stacking too many changes together.
  2. for the popup, I was more thinking about this one: https://codesandbox.io/s/yiwhw
  1. yeah... that's what I expected this to do. Not sure why the old commits are included... I believe I need to rebase.
  2. Ah! Okay. I can work on that. Would you like that type of popup for the contributors' credit as well?
xunhuang commented 4 years ago

Would you like that type of popup for the contributors' credit as well? Yes I do. We will have more real estate and control to work with. Thanks!

tumbleshack commented 4 years ago

@xunhuang , I cannot for the life of me figure out how to get rid of that huge stack of commits. I've been struggling with this all afternoon. Every time that I make a PR, they're all there. Do you have any tips?

xunhuang commented 4 years ago

https://stackoverflow.com/questions/14635672/rebase-a-single-git-commit

On Thu, Apr 30, 2020 at 2:04 PM tumbleshack notifications@github.com wrote:

@xunhuang https://github.com/xunhuang , I cannot for the life of me figure out how to get rid of that huge stack of commits. I've been struggling with this all afternoon. Every time that I make a PR, they're all there. Do you have any tips?

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/xunhuang/covid-19/pull/94#issuecomment-622110942, or unsubscribe https://github.com/notifications/unsubscribe-auth/AAFSGF5NZ2XEVZAC35QEWVLRPHRVJANCNFSM4MWPFWMA .

xunhuang commented 4 years ago

I just tried it,

git checkout master git cherry-pick

this worked. Replace "master" with whatever branch you want to be in.

On Thu, Apr 30, 2020 at 2:07 PM Xun Wilson Huang xhuang@gmail.com wrote:

https://stackoverflow.com/questions/14635672/rebase-a-single-git-commit

On Thu, Apr 30, 2020 at 2:04 PM tumbleshack notifications@github.com wrote:

@xunhuang https://github.com/xunhuang , I cannot for the life of me figure out how to get rid of that huge stack of commits. I've been struggling with this all afternoon. Every time that I make a PR, they're all there. Do you have any tips?

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/xunhuang/covid-19/pull/94#issuecomment-622110942, or unsubscribe https://github.com/notifications/unsubscribe-auth/AAFSGF5NZ2XEVZAC35QEWVLRPHRVJANCNFSM4MWPFWMA .

tumbleshack commented 4 years ago

I created a new branch, cherry-picked in the commit I wanted, pushed it to my origin, then tried to open a PR merging my new branch into your master, and it brought the stack of 27 commits along with it

my branch is called footerAsPopup. Can you also try to open this PR?

xunhuang commented 4 years ago

probably your new branch was off your old branch. You should pull from master, that should have non your changes. Create a branch off that (master), and then cherrypick your change into that new branch, and create PR. delete your old branch as quickly as possible as it's already merged.

On Thu, Apr 30, 2020 at 2:52 PM tumbleshack notifications@github.com wrote:

I created a new branch, cherry-picked in the commit I wanted, pushed it to my origin, then tried to open a PR merging my new branch into your master, and it brought the stack of 27 commits along with it

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/xunhuang/covid-19/pull/94#issuecomment-622134852, or unsubscribe https://github.com/notifications/unsubscribe-auth/AAFSGF6VWQMBKO2F57OVGPLRPHXJDANCNFSM4MWPFWMA .

tumbleshack commented 4 years ago

I think the problem is in master. I guess git thinks that all those commits are not yet part of 'master'? I did the following:

  1. delete my broken feature branch
  2. checkout master; fetch upstream (your repo)
  3. merge upstream/master and push to origin (my fork)
  4. Create a new feature branch off of master
  5. Check out the new branch, make some changes, commit them
  6. push the commit to a new upstream branch on origin (my fork)
  7. Create a PR, observe that all 28 commits are
xunhuang commented 4 years ago

I think you didn't create a feature branch at the beginning so your master was dirty. I suggest that you do a git show for your last commit, save it. Delete everything and do a git clone again to start fresh. manually redo your change again (from the saved git diff).

On Thu, Apr 30, 2020 at 3:12 PM tumbleshack notifications@github.com wrote:

I think the problem is in master. I guess git thinks that all those commits are not yet part of 'master'? I did the following:

  1. delete my broken feature branch
  2. checkout master; fetch upstream (your repo)
  3. merge upstream/master and push to origin (my fork)
  4. Create a new feature branch off of master
  5. Check out the new branch, make some changes, commit them
  6. push the commit to a new upstream branch on origin (my fork)
  7. Create a PR, observe that all 28 commits are

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/xunhuang/covid-19/pull/94#issuecomment-622143745, or unsubscribe https://github.com/notifications/unsubscribe-auth/AAFSGF5KFL4R5AP73EQIOKDRPHZWHANCNFSM4MWPFWMA .

tumbleshack commented 4 years ago

That did the trick! Thanks for your help! I did:

git reset --hard upstream/master  
git push origin master --force
xunhuang commented 4 years ago

happy to help. Glad you are so persistent. Once a while we all get into something minor, feel free to ping me.

On Thu, Apr 30, 2020 at 5:08 PM tumbleshack notifications@github.com wrote:

That did the trick! Thanks for your help! I did:

git reset --hard upstream/master git push origin master --force

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/xunhuang/covid-19/pull/94#issuecomment-622184119, or unsubscribe https://github.com/notifications/unsubscribe-auth/AAFSGF23HG57B3WPDOJYQ6TRPIHIFANCNFSM4MWPFWMA .