GIT allows us to rename branches locally. In this case, I had mistaken my ticket reference consistently so as to incorrectly assign all my work references to this, presently unworked ticket. One of Jira’s convenient features is that it automatically joins valid ticket references to the tickets they are referencing. Each commit also had valid working notes with this, the wrong ticket, as the ticket reference. Sure enough, the branch had my ticket number on it and the description of the ticket I was actually working on. When my coworker alerted me to this, I went to the wrong ticket, which had no work performed on its behalf yet, and found this: The beginning of the problem is that while the work was valid, it was referenced to the wrong branch. Process Breakdown Identifying the Problem Any GIT compatible process can perform the same overall process. Note: this process is universal, the tool of choice I used when I did this was SourceTree. Renamed each commit on the new branch using interactive rebase to the correctly named branch references Pushed that change to origin by the same nameĬonfirmed the new branch had my code on it (check for silly mistakes)ĭeleted the wrongly named branch from origin (already changed in local from #1) This was still quite early in the process, so I decided to quickly relocate the branch and commit references from the ticket I was not working to the one I was. I had not merged in the work yet, so there was no harm to our environment branches nor the core master. One of my coworkers alerted me to my mistake when someone else tried to pick up the ticket that I was incorrectly cross-referencing in my work. I recently made the mistake of referencing the wrong ticket number from our ticket management system (we were using Jira) when I made the ticket and 3 commits to the feature.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |