News for hackers. Stuff that matters.
Re:Git Tricks: Avoiding merge when dealing with remote confl... by northwest65 on Monday October 21, 2019 @10:51PM (#21319973)
I'm far from an advanced user, but I use rebase fairly regularly for long running feature branches. As the parent branch continues along, I periodically rebase complicated feature branches so that I'm doing a number of small easy to handle conflict resolutions, rather than one almighty one at the end. I've never had any trouble, and I'd never considered it to be anything out of the ordinary or anything other than basic!
Re:Git Tricks: Avoiding merge when dealing with remote confl... by DuskStar on Monday October 21, 2019 @11:30PM (#21320154)
Huh. Personally, I merge master into my feature branches to keep up to date instead of rebasing - I find it helps the tree match the actual actions that were taken.