search

bensheldon / sheldoncalderon-wedding

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

added FAQ, SF todo sans photos #17

Closed alinapaz closed 10 years ago

alinapaz commented 10 years ago

@bensheldon how to merge w/ team bios?

bensheldon commented 10 years ago

I'm really confused why there are a whole lot of changes in this commit one that aren't related to the FAQ.. which is also why it's not able to merge cleanly. You can try merging from master (once you've synced it with what's on Github's master) into your branch, which should hopefully cleanup the diff and changes.

alinapaz commented 10 years ago

Thanks. Still confused about how to change diff parts of the website an merge them.

I wanted to merge placeholders/2 with placeholders in GitHub, not the master but forgot to select the other branch when I made the pull request — Sent from Mailbox for iPhone

On Tue, Jan 14, 2014 at 10:28 AM, Ben Sheldon notifications@github.com wrote:

I'm really confused why there are a whole lot of changes in this commit one that aren't related to the FAQ.. which is also why it's not able to merge cleanly. You can try merging your master (once you've synced it with what's on Github's master) into your branch, which should hopefully cleanup the diff and changes.

Reply to this email directly or view it on GitHub: https://github.com/bensheldon/sheldoncalderon-wedding/pull/17#issuecomment-32280255

bensheldon commented 10 years ago

You can merge things locally with Gitbox. Just select the local branch you want to merge on the Right side into your working branch that's on the Left side. and the Push/Pull buttons will turn into a "<-Merge" button.

bensheldon commented 10 years ago

Just remember that a "commit" in git is a list of line-level changes within a file between the previous commit and this one ("changes" not outcomes). So if you change something in one branch, then go to another branch with other changes and change it, when you go to merge, git will get confused because even if the outcome is the same the changes themselves are different. 

Branch A: 10 -> (commit: add 4) -> 14 -> (commit: subtract 6) -> 8

Branch B: 10 -> (commit: subtract 2) -> 8

So even though both end up with 8, git can have trouble merging them because the changes themselves are different despite equivalent outcomes. 

Which is why it's important to make small, isolated changes and get them merged quickly. Which is one of those areas where the tools align with good engineering practice (narrowly scoped features, continuously deployed)

On Tue, Jan 14, 2014 at 8:31 AM, Angelina Calderon notifications@github.com wrote:

Thanks. Still confused about how to change diff parts of the website an merge them. I wanted to merge placeholders/2 with placeholders in GitHub, not the master but forgot to select the other branch when I made the pull request — Sent from Mailbox for iPhone On Tue, Jan 14, 2014 at 10:28 AM, Ben Sheldon notifications@github.com wrote:

I'm really confused why there are a whole lot of changes in this commit one that aren't related to the FAQ.. which is also why it's not able to merge cleanly. You can try merging your master (once you've synced it with what's on Github's master) into your branch, which should hopefully cleanup the diff and changes.

Reply to this email directly or view it on GitHub:

https://github.com/bensheldon/sheldoncalderon-wedding/pull/17#issuecomment-32280255

Reply to this email directly or view it on GitHub: https://github.com/bensheldon/sheldoncalderon-wedding/pull/17#issuecomment-32280611

bensheldon commented 10 years ago

Closed because included in 6382f186550af230f6