85

Why Git is hard(roadrunnertwice.dreamwidth.org)

posted
by
Avatar
learnbyexample@programming.dev
in
Avatar
programming@programming.dev
62 comments
hidereport
Sort:
HotTopControversialNewOld
You are viewing a single thread.
View all comments View context
Avatar
yaaaaayPancakes@lemmy.world
2 points

Because rebase is fraught with peril, if you also push rebased branches upstream and someone else works off that branch.

If you stick to the rule of only using rebase on local branches that have never been pushed upstream, it’s an awesome tool. If you don’t, you’re eventually going to cause someone to have a bad day.

permalink
report
parent
reply
Avatar
bellsDoSing@lemm.ee
2 points

Yeah, basically anything that rewrites already pushed history and is then (force-) push is bound to create problems (unless it’s a solo dev only ever coding on a single device, who uses the remote repo as a mere backup solution).

permalink
report
parent
reply
Avatar
thequickben@lemmy.ml
2 points

Yep. I work exclusively in forks, and all my work is done on my machine, rebased, squashed and then pushed to my fork for a PR. No commits from main are ever touched in my rebase. It’s such a clean workflow for me.

permalink
report
parent
reply

Programming

!programming@programming.dev

Create post

Welcome to the main community in programming.dev! Feel free to post anything relating to programming here!

Cross posting is strongly encouraged in the instance. If you feel your post or another person’s post makes sense in another community cross post into it.

Hope you enjoy the instance!

Rules

Rules

  • Follow the programming.dev instance rules
  • Keep content related to programming in some way
  • If you’re posting long videos try to add in some form of tldr for those who don’t want to watch videos

Wormhole

Follow the wormhole through a path of communities !webdev@programming.dev

Community stats

  • 3.5K

    Monthly active users

  • 1.6K

    Posts

  • 26K

    Comments

Community moderators