search

bensheldon / sheldoncalderon-wedding

Ben ♡ Angelina ♡ Middleman ♡ S3 ♡ Travis
http://sheldoncalderon.com
1 stars 0 forks source link

Placeholders #15

Closed alinapaz closed 10 years ago

alinapaz commented 10 years ago

@bensheldon howsit?

bensheldon commented 10 years ago

So you have the llbean registry commit in this branch with the bios. So that means you can either:

  1. Delay pushing the llbean update to production until the bios are finished. Or
  2. Add another commit that rehides the bios and then merge this branch. Or
  3. Checkout a new branch from master specifically for the registry and cherry-pick the llbean commit, then open a pull request for that new branch.
alinapaz commented 10 years ago

I think I did #2 (2. Add another commit that rehides the bios and then merge this branch. ). The LL Bean link is live on our site, but the bios are hidden.

Help me clean up the branch later tonight?

On Sun, Dec 1, 2013 at 5:32 PM, Ben Sheldon notifications@github.comwrote:

So you have the llbean registry commit in this branch with the bios. So that means you can either:

  1. Delay pushing the llbean update to production until the bios are finished. Or
  2. Add another commit that rehides the bios and then merge this branch. Or
  3. Checkout a new branch from master specifically for the registry and cherry-pick the llbean commit, then open a pull request for that new branch.

On Sun, Dec 1, 2013 at 5:27 PM, Angelina Calderon notifications@github.com wrote:

@bensheldon howsit? You can merge this Pull Request by running: git pull https://github.com/bensheldon/sheldoncalderon-weddingplaceholders Or you can view, comment on it, or merge it online at: https://github.com/bensheldon/sheldoncalderon-wedding/pull/15 -- Commit Summary --

— Reply to this email directly or view it on GitHubhttps://github.com/bensheldon/sheldoncalderon-wedding/pull/15#issuecomment-29589482 .

Angelina Calderon

tel: 608.628.1956 alinapaz@gmail.com http://www.angelinacalderon.com

bensheldon commented 10 years ago

Ah. Ok. That works too. Nothing to clean up if you merged the branch. Branches in git are a convenience for organizing changes (sets of commits). Once you merge the branch into master, there isn't any "memory" of where those commits used to live so you don't need to worry about the branch once the commits have been merged. Think of it like a Venn diagram where Master is one circle and your branch is the the other circle: most of the history of the project is in the middle and the only things you need to worry about are what is solely in your feature branch (which is what shows up in the pull request) or what is solely in master (which can cause merge conflicts if you're trying to move both of them from their own circles into the middle/combined area). Also, that's how gitbox organizes stuff too: if there is a green dot on the commit it's solely in the "other" branch, if it has a blue dot it's solely in your working/active branch, and if there is no dot it's shared in both.