Switched back to my feature branch, rebased my changes onto master. First I pulled latest from master to get the most recent changes. Master was updated with other dev changes, so at the end of the day I went ahead and was ready to rebase. So my feature branch already exists remotely, this is one of the differences from the previous scenario, where for that one, a remote branch had not yet been created. The following day, I had another feature branch I was working on, and usually I’ll push my feature branch up to remote to save my changes throughout the day for larger tasks. I rebased current changes onto master, and voila, everything worked out. I followed the same steps above on my new and small feature branch. The next day came and at the first opportunity I got to rebase on client work, I went for it.
0 Comments
Leave a Reply. |
Details
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |