TheCommieAxolotl@programming.dev to Programming@programming.devEnglish · 2 years agoRelaGit: First Beta Release now available to download.git.rela.devexternal-linkmessage-square15fedilinkarrow-up153arrow-down14
arrow-up149arrow-down1external-linkRelaGit: First Beta Release now available to download.git.rela.devTheCommieAxolotl@programming.dev to Programming@programming.devEnglish · 2 years agomessage-square15fedilink
minus-squareBrianTheeBiscuiteer@lemmy.worldlinkfedilinkarrow-up3·2 years agoDoes this help with rebasing? I rarely have a need to rebase but all the same I avoid it because I just don’t get it.
minus-squareTheCommieAxolotl@programming.devOPlinkfedilinkarrow-up2·2 years agoNot currently but it is planned to be added soon along with in-client conflict resolution.
minus-squareQuadriLiteral@programming.devlinkfedilinkarrow-up1·2 years agoRebasing is basically copy/paste of commits. I do it all the time, to keep a feature branch updated with develop for instance.
minus-squareBrianTheeBiscuiteer@lemmy.worldlinkfedilinkarrow-up1·2 years agoI normally just do a merge and resolve the conflicts.
Does this help with rebasing? I rarely have a need to rebase but all the same I avoid it because I just don’t get it.
Not currently but it is planned to be added soon along with in-client conflict resolution.
Rebasing is basically copy/paste of commits. I do it all the time, to keep a feature branch updated with develop for instance.
I normally just do a merge and resolve the conflicts.