Then push the branch, and release from that branch. Despite a lack of tags or branches involved in the current process, this was quite easy to do. At some point I realize that this change is bad enough that I just need to go back in time to where the code was more stable, and deploy from there. Right now, the production release process for this particular code is "check out trunk, restart" (yeah, yeah, I'm working on it, it's only been a month ok?). On the other hand, we had a production issue tonight. These may (probably) be user error but it is so tiresome to be yet again at a place where the tools have not caught up with the cool new thing and don't bother to streamline the common case. No matter how unrelated and auto-mergeable the changes are, EGit doesn't seem to let me pull them. I also seem to keep hitting problems with merging when I've made changes to files that have subsequently been changed. Why, why, why do I need to ADD this file? I understand that commandline git (and svn) require "add" before commit, but using Subversive for the last few years I've gotten out of the habit because, seriously, if I highlight it to be checked in just add it for me. I commit and push my changes and leave to go to a meeting that ends up going for 2 hours, only to return to a request that I add a new file that had gotten missed in the commit. Today, a coworker and I do a little pairing, write the skeleton of some new features. Lots of right-clicks (hey, it's Eclipse so whatever), remember to commit, then push, great. I thought that after half a day of struggle, accidental bad merges, and confusion I finally managed to get the hang of EGit. I've been using git in anger for about a week now, after we migrated our repos at work to github.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |