3 ms·
It sounds like you finish your work much faster than I do. I usually go for the same workflow as you do, but it can take days between a branch being created and
by simiones 6y ago
It sounds like you finish your work much faster than I do. I usually go for the same workflow as you do, but it can take days between a branch being created and the moment I'm done with it. During this time, I often want to keep up with the latest changes on master. Other times, more than one person works on a feature branch, so they still need to git pull from origin/feature-branch into feature-branch to get the changes from the other committer.
I would be very happy if I could just merge to master every day, but that is extremely rare for me and my team.
- rleigh 6y agoNo, I don't necessarily work any faster. But I will switch between multiple feature branches as necessary. And to keep up with master, I'll rebase my feature branch onto origin/master or depending upon the circumstance I'll directly merge origin/master. Both keep me up-to-date without a direct pull.
- simiones 6y agoWell, if you're switching branches, you already have problems with a dirty worktree. Also, pulling can actually mean rebasing (I always use pull --rebase).
- cdcarter 6y agoI've worked at a few places where CI will automatically merge main back into open feature branches (or at least open PRs). It's quite nice.