search

japacible / commission-me

Platform for commissioners and buyers to connect and finalize sales.
http://commissionme.herokuapp.com/
4 stars 3 forks source link

So about this branch merge..? #215

Closed Bejoty closed 11 years ago

Bejoty commented 11 years ago

298448f98b4e645eaa4f6feefbc9eeaca7227021

Just pushing edits for a couple files (d81457189d7d097124e41121263b53abff450947), and the merge commit went with it I guess? I'm not precisely sure why this happens, so whoever is knowledgeable about this stuff, please educate me.

And definitely feel free to revert if it messed things up.

japacible commented 11 years ago

Yeah merge commits happen automatically sometimes. If you check the commit history, you'll see that there are a bunch of "Merge branch {branch} of {repo}" messages.

@Bejoty please check the current state of the repo to see if it's at a state you want it to be in.

japacible commented 11 years ago

Also.. looks like the changes aren't minor. Did someone code review and test this before you merged?

Bejoty commented 11 years ago

I didn't want to merge. I only edited two files. The first commit is the one I wanted.

japacible commented 11 years ago

Oh, my bad. I thought you merged that into master.

Yeah, so other people pushed to wip-commissions since you last pulled, so the other code and yours will be merged together. Does that make sense?

japacible commented 11 years ago

Do you still have questions about this, or is this closeable?

Bejoty commented 11 years ago

I primarily want to verify that I'm not updating the branch with old code. Usually I can just pull for updates and it doesn't do a merge commit. The fact that it committed makes me think that it changed the branch to whatever files I had locally.

kcorman commented 11 years ago

Don't worry too much, the only way you will update with 'old code' is if you explcitly use the git revert command, which basically "creates new code that cancels out previous code, thus creating new old code". XD

If you were working on a branch, made a few changes locally, and then pulled the remote branch after committing, you may be prompted to merge, since your local branch is a different branch than the remote at that point.

Bejoty commented 11 years ago

Okay, I think that makes sense to me then. If things are working, then awesome.