latest 20 messages by wastrel

+ [2016-04-15T14:45:32Z] wastrel ok thanks
+ [2016-04-15T14:45:24Z] wastrel because i forgot to pull changes this morning hence the conflict
+ [2016-04-15T14:45:08Z] wastrel oh jesus ok those come from master
+ [2016-04-15T14:44:37Z] wastrel i updated 4 files, 1 has a conflict, now there's 20 files in my commit
+ [2016-04-15T14:44:26Z] wastrel but what are all those other files?
+ [2016-04-15T14:42:59Z] wastrel Seveas: https://pastee.org/3x78h
+ [2016-04-15T14:37:07Z] wastrel <3
+ [2016-04-15T14:32:09Z] wastrel now i have like 20 files that want to be committed
+ [2016-04-15T14:31:28Z] wastrel "
+ [2016-04-15T14:31:24Z] wastrel i have a commit that's 4 files, one line of one file is the merge conflict. I follow the instructions "git fetch origin; git checkout -b branch_name origin/branch_name; git merge master
+ [2016-04-15T14:30:26Z] wastrel i have a merge conflict and it is hateful to me and i want to get rid of it but i don't understand what the instructions are doing
+ [2015-09-15T19:05:42Z] wastrel the instructions don't say to do this
+ [2015-09-15T19:05:37Z] wastrel anyway that's what i did. i then edited the file with the merge conflict. I assume i now add and check the changed file in ?
+ [2015-09-15T19:05:08Z] wastrel 1 fails at git checkout -b branch-name origin/branch-name; because the local branch already exists. i assume it's ok to just git checkout branch-name at this point ?
+ [2015-09-15T19:04:27Z] wastrel and 2. git checkout master; git merge --no-ff rakefile-update; git push origin master
+ [2015-09-15T19:04:00Z] wastrel hi i am trying to merge with conflicts on command line, github tells me to 1. git fetch origin; git checkout -b branch-name origin/branch-name; git merge master
+ [2015-05-22T19:22:34Z] wastrel hay Seveas $work just had a meeting about our git flow actually
+ [2015-05-22T19:21:04Z] wastrel have a look at some of that and it will start making sense
+ [2015-05-22T19:20:46Z] wastrel what you need to do with git will be a factor in what you learn about it