So I reset feature back to right before I had merged in develop and used git's cherry Simply ran git pull origin develop on feature and feature was almost completely reset to its original state. So there shouldn't have been anything in the changelog that created conflicts. Mind you, neither ui nor xss had made any changes to these files Reset to the state the files looked on develop. The Weirdįirst, I noticed as soon as I pulled develop into feature, almost all the changes I had made to feature were As before, I wanted some of these UI changes on myįeature branch, so I pulled develop into feature once more. Once they were complete, we squashed and merged them into develop. So again, I made a new branch from develop, let's call it ui, and I started making my changes there. Pulled develop into my feature branch and continued working.Ī couple days later, I took a break from working on feature and spent a little time working on some UI updates on Now I needed this fix in my current branch, so I Xss), made my fixes, and merged these changes back in to develop. So again, I branched off develop (this branch we'll call Since fixing this was adjacent to what I was actually working on, and affected more than just where I was makingĬhanges, I decided to fix it separate from my current branch. To some XSS attacks through user input markdown. Process, I discovered that a couple pages I was working on, as well as a couple I wasn't working on, were all vulnerable Like I'm supposed to, I branch off develop and start making my changes, we'll call this branch feature. I was working on making some large improvements to a website that multiple people here have there hands in as well. Mean time, let me paint you a picture of my problem and the steps I took to solve it. Those of you reading this may hear my problem and think, "You dolt, if only you had done " and if that is you, I cannot stress this enough, please let me know what that solution was. "professional" programmer for a whopping 5 months, git is still, largely: ¯\_(ツ)_/¯ Sorcery? The title of this post is really an admonition for myself more than anything else. Shenanigans and you can help me "git gud". ) Let me regale you with a tale of my git I am no git wizard, not even adept really.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |