Re:Git is too hard
by pelasaco on Tuesday November 17, 2020 @06:45AM
(#25122618)
I use git daily. I never use merge. I use git rebase, and its interactive version all day.
[ Parent
| on HN ]
You'll potentially need to use merge if you're collaborating with others on feature branches.
Re:Git is too hard
by secondcoming on Tuesday November 17, 2020 @07:11AM
(#25122822)
Ya, I'm the opposite, I never use rebase. Horses for courses...
You should, or do you just merge updated remote branches into your stale local branches? A lot of new developers seem to do that here until we explain to them how it messes up the history.
Re:Git is too hard
by Supermancho on Tuesday November 17, 2020 @09:02AM
(#25123802)
> do you just merge updated remote branches into your stale local branches?
Every single developer I work with (or have in the last 8 years) does this. "Messes up the history" ? The merge commit describes that there are uptaken changes from the "main" branch. It doesn't seem to be a problem in practice.
Re:Git is too hard
by KptMarchewa on Tuesday November 17, 2020 @09:44AM
(#25124244)
It's also not a problem for me, because I squash the commits on merge to master or other remote branch.
Re:Git is too hard
by secondcoming on Tuesday November 17, 2020 @01:31PM
(#25127603)
We don't merge one-off branches into other one-off branches unless they're all under the same feature. Everything goes via develop when they're complete, and new one-off branches are created from develop.
When we release to production, develop gets merged to master.
We consider a 'feature' a large piece of work that will take several weeks, during which time several releases to production may be done for other work/tickets.