search

ga-wdi-boston / team-project

Other
2 stars 39 forks source link

Minor merge conflict #371

Closed jbculbertson closed 7 years ago

jbculbertson commented 7 years ago

Hi there,

Somehow, I have a merge conflict on my local branch that others on my team don't. Its related to the initial commits that we made on our master branch (accidentally) to change the README. Over the weekend, I was able to work through this because we knew the conflict was unimportant. Could someone please help us work through resolving this?

payne-chris-r commented 7 years ago

Is this good?

jbculbertson commented 7 years ago

My conflict still exists (dev branch is xx commits ahead of master, 2 behind), but we can't get it to surface again. We told Ben we would grab him when we get the issue to show again

payne-chris-r commented 7 years ago

dev branch ahead of master isn't really a merge conflict. It's probably just a fact? It's not something worth worrying about unless it shouldn't be!

jbculbertson commented 7 years ago

Dev branch is ahead of master, but at the same times its two commits behind

scottyscripts commented 7 years ago

Any updates on this issue @jbculbertson ?

jbculbertson commented 7 years ago

Chris walked us through resolving this minor conflict