search

jatwell93 / rubyproject

1 stars 1 forks source link

bundler issue - trollop required #49

Open Mirv opened 7 years ago

Mirv commented 7 years ago

I take you had fun installing things...I had to add trollop to the bundle & then comment it out afterwards.

jatwell93 commented 7 years ago

Sorry! I thought to delete what I added before merging would fix it, but I forgot about the Gemfile.lock. How would I avoid that mistake in the future when we're both working on different branches? I had to go through merge conflicts but I just clicked to use yours on all of them .

Mirv commented 7 years ago

You can't avoid conflicts - I do appreciate using mine, but if it breaks your stuff evaluate & ping me on the issues so I am doubly sure to git pull & analyze it.

Really in async style coding like we are doing currently, each guy needs to mindfully program (like if there's a variable being used by someone else & you want it, either limit the scope by enclosing a copy in another object or use a different name). The conflicts get less if you merge master more frequently too.

Also, in a normal situation you'd have tests in place for everything & not merge if the tests fail. Which would allow both of us to be mindful of each other!

Mirv commented 7 years ago

Oh & one good way to make sure you get everything you changed,

Git Status

Allows you to see everywhere you changed pretty quickly & once you push a branch to the github, use their page to compare it to master - which is very enlightening & easier than in console.

jatwell93 commented 7 years ago

Ah good pointI should've reviewed the git status more thoroughly. I think i just need to remember to only edit the bare minimum to try to get done what i need to do :)