{"push_id":1164852915,"size":25,"distinct_size":25,"ref":"refs/heads/master","head":"9c145a2fd497abfddc14edfbda4cccd5a45f7bfa","before":"1a177c78ef5a8f3530f219cff4217f1afb8de309","commits":[{"sha":"80ebc13fd4b3cd61ade4eb2f9da175ee044552a0","author":{"name":"Sockleblu","email":"2727dd0919c7c2c7b0ab0971ca809c85383c025b@gmail.com"},"message":"Changed feature to mismatch master\n\nTrying merge again","distinct":true,"url":"https://api.github.com/repos/sockleblu/hello-world/commits/80ebc13fd4b3cd61ade4eb2f9da175ee044552a0"},{"sha":"8ed763f35b474fa0ededa128c0f08817015c0b1d","author":{"name":"Sockleblu","email":"2727dd0919c7c2c7b0ab0971ca809c85383c025b@gmail.com"},"message":"Trying out merge conlfict without abort\n\naoeuaeue","distinct":true,"url":"https://api.github.com/repos/sockleblu/hello-world/commits/8ed763f35b474fa0ededa128c0f08817015c0b1d"},{"sha":"652d7b2adb1d35f874adc40f61e4a3ddb3bc4181","author":{"name":"Sockleblu","email":"2727dd0919c7c2c7b0ab0971ca809c85383c025b@gmail.com"},"message":"Merge branch 'feature'\n\nResolving confilct with README.md file with the ours merge flag to keep the master branch intact","distinct":true,"url":"https://api.github.com/repos/sockleblu/hello-world/commits/652d7b2adb1d35f874adc40f61e4a3ddb3bc4181"},{"sha":"d3236299cf0c0b89584d7bd5aca6c71f06554d4f","author":{"name":"Sockleblu","email":"2727dd0919c7c2c7b0ab0971ca809c85383c025b@gmail.com"},"message":"Changing README.md file to differ from master\n\nTesting out merge when master is not changed in the process","distinct":true,"url":"https://api.github.com/repos/sockleblu/hello-world/commits/d3236299cf0c0b89584d7bd5aca6c71f06554d4f"},{"sha":"ef8b8e004e1090a45da196df9737f59eadd0e824","author":{"name":"Sockleblu","email":"2727dd0919c7c2c7b0ab0971ca809c85383c025b@gmail.com"},"message":"Changing master branch\n\nBy changing the masters branch and the feature branch being up to date I can see that the feature branch changes as the master branch changes, even if the modifications are not added or commited. Will now further play with changes","distinct":true,"url":"https://api.github.com/repos/sockleblu/hello-world/commits/ef8b8e004e1090a45da196df9737f59eadd0e824"},{"sha":"7ac8cc18866061a61898aec5688169260dfa6a0a","author":{"name":"Sockleblu","email":"2727dd0919c7c2c7b0ab0971ca809c85383c025b@gmail.com"},"message":"Added a new file to play with\n\nThis file will be where conflicts happen","distinct":true,"url":"https://api.github.com/repos/sockleblu/hello-world/commits/7ac8cc18866061a61898aec5688169260dfa6a0a"},{"sha":"9dcfe36a86bb5b2b3ab8cf0491a675202b2e8363","author":{"name":"Sockleblu","email":"2727dd0919c7c2c7b0ab0971ca809c85383c025b@gmail.com"},"message":"Changed new.txt to differ from feature\n\nnew.txt now has different content than feature branch","distinct":true,"url":"https://api.github.com/repos/sockleblu/hello-world/commits/9dcfe36a86bb5b2b3ab8cf0491a675202b2e8363"},{"sha":"29a4d1200c204e7532e95348b40d4669e2888220","author":{"name":"Sockleblu","email":"2727dd0919c7c2c7b0ab0971ca809c85383c025b@gmail.com"},"message":"Changed the contents of new.txt in feature branch\n\nContents of new.txt says what the feature branch wants it to say","distinct":true,"url":"https://api.github.com/repos/sockleblu/hello-world/commits/29a4d1200c204e7532e95348b40d4669e2888220"},{"sha":"ec0737ec4f443a557aff203eedfb313e692cf86c","author":{"name":"Sockleblu","email":"2727dd0919c7c2c7b0ab0971ca809c85383c025b@gmail.com"},"message":"Master changes new.txt without merge from feature\n\nThe new.txt file contents have changed in master before the changes in new.txt from the feature branch have had a chance to merge. The conflict must be resolved","distinct":true,"url":"https://api.github.com/repos/sockleblu/hello-world/commits/ec0737ec4f443a557aff203eedfb313e692cf86c"},{"sha":"091f222b371647cb006fe9bc09da7c6ebf34056e","author":{"name":"Sockleblu","email":"2727dd0919c7c2c7b0ab0971ca809c85383c025b@gmail.com"},"message":"Merge branch 'feature'\n\nThis should override the feature branch with the masters","distinct":true,"url":"https://api.github.com/repos/sockleblu/hello-world/commits/091f222b371647cb006fe9bc09da7c6ebf34056e"},{"sha":"df39618743e42fa809369e0882d377208e51cb55","author":{"name":"Sockleblu","email":"2727dd0919c7c2c7b0ab0971ca809c85383c025b@gmail.com"},"message":"Changed new.txt in feature\n\nTrying to get the feature changes to propogate to master branch","distinct":true,"url":"https://api.github.com/repos/sockleblu/hello-world/commits/df39618743e42fa809369e0882d377208e51cb55"},{"sha":"8eac7e7008e8baa451f1f0920dca949ed8496b4f","author":{"name":"Sockleblu","email":"2727dd0919c7c2c7b0ab0971ca809c85383c025b@gmail.com"},"message":"Changed master to fit feature\n\nModified new.txt to match what is in feature branch","distinct":true,"url":"https://api.github.com/repos/sockleblu/hello-world/commits/8eac7e7008e8baa451f1f0920dca949ed8496b4f"},{"sha":"aff7be7c241d3f3277822598fdf7f8515c024598","author":{"name":"Sockleblu","email":"2727dd0919c7c2c7b0ab0971ca809c85383c025b@gmail.com"},"message":"Merge branch 'feature'\n\nI had to change master/new.txt to match feature/new.txt in order for the merge to work. There has to be a better way to resolve conlicts then by manually typing the change. Gotta look into merge tool","distinct":true,"url":"https://api.github.com/repos/sockleblu/hello-world/commits/aff7be7c241d3f3277822598fdf7f8515c024598"},{"sha":"6b79a6f05339d7b11bdc7df47d7d44a8be06316a","author":{"name":"Sockleblu","email":"2727dd0919c7c2c7b0ab0971ca809c85383c025b@gmail.com"},"message":"Changed feature/new.txt to say something new\n\nI'm checking to see if the merge happened properly and that I may be able to mereg again with no errors or problems","distinct":true,"url":"https://api.github.com/repos/sockleblu/hello-world/commits/6b79a6f05339d7b11bdc7df47d7d44a8be06316a"},{"sha":"0488982fba2dd4a8ebe8af110d217d516beb2fa7","author":{"name":"Sockleblu","email":"2727dd0919c7c2c7b0ab0971ca809c85383c025b@gmail.com"},"message":"Merge branch 'feature'\n\nLooks like the previous conflict had been resolved peacefully as I can now continue with no problems","distinct":true,"url":"https://api.github.com/repos/sockleblu/hello-world/commits/0488982fba2dd4a8ebe8af110d217d516beb2fa7"},{"sha":"222e18db0913574bc081e8ed714404244dce9eb8","author":{"name":"Sockleblu","email":"2727dd0919c7c2c7b0ab0971ca809c85383c025b@gmail.com"},"message":"Changing master/new.txt\n\nI want to have changes to master added to feature","distinct":true,"url":"https://api.github.com/repos/sockleblu/hello-world/commits/222e18db0913574bc081e8ed714404244dce9eb8"},{"sha":"d96698de04f0461c03b070b8872c05003793c267","author":{"name":"Sockleblu","email":"2727dd0919c7c2c7b0ab0971ca809c85383c025b@gmail.com"},"message":"Changing master/new.txt\n\nsee if merging master to feature while feature has a new file will create problems","distinct":true,"url":"https://api.github.com/repos/sockleblu/hello-world/commits/d96698de04f0461c03b070b8872c05003793c267"},{"sha":"d358f4a2fa3205be9e30a1999d4f45b4df10f68d","author":{"name":"Sockleblu","email":"2727dd0919c7c2c7b0ab0971ca809c85383c025b@gmail.com"},"message":"Adding file feature/another_new.txt\n\nplaying with file merges","distinct":true,"url":"https://api.github.com/repos/sockleblu/hello-world/commits/d358f4a2fa3205be9e30a1999d4f45b4df10f68d"},{"sha":"f8c169cfb13261a77c4b10faf7fe80e845302391","author":{"name":"Sockleblu","email":"2727dd0919c7c2c7b0ab0971ca809c85383c025b@gmail.com"},"message":"Merge branch 'master' into feature\n\naeuaeuaeu","distinct":true,"url":"https://api.github.com/repos/sockleblu/hello-world/commits/f8c169cfb13261a77c4b10faf7fe80e845302391"},{"sha":"2c73da2ff1b2b6dcce40269318f8806be698cb83","author":{"name":"Sockleblu","email":"2727dd0919c7c2c7b0ab0971ca809c85383c025b@gmail.com"},"message":"Master/another_new.txt changes\n\nI wanted the new file to say something relevant so I changed it","distinct":true,"url":"https://api.github.com/repos/sockleblu/hello-world/commits/2c73da2ff1b2b6dcce40269318f8806be698cb83"}]}
{"actor":{"display_login":"sockleblu"}}