yeah, I finally did get it to work. It works more like a merge than the rebase I'm used to, but it works just fine.
On Fri, Feb 7, 2025 at 1:55 PM Jacob Moody <mo...@posixcafe.org> wrote: > On 2/7/25 15:11, ron minnich wrote: > > I did try this > > git/branch ron_nix > > git/rebase remotes/front/front > > > > it ended very badly. > > > Your understanding of remote/* is incorrect, run git/branch -a which will > give you all of > the remote/* branches as followed by your repo. When you git/pull -f, > those are what get updated, > if you omit the -f then it _also_ updates your "local" branch. > > If the remote default branch you're pulling from is named "front" then the > remote branch is likely remotes/origin/front. > The convention is remotes/$remotename/$remotebranch. > > Again I don't use our rebase, it's a thin wrapper on top of exporting and > importing which I tend to do myself I would suggest > to start without it to get an understanding of how this stuff works. > > Thanks, > moody > ------------------------------------------ 9fans: 9fans Permalink: https://9fans.topicbox.com/groups/9fans/T9075ee3b04492dd0-Mb0a594eccf9b4c5411d05359 Delivery options: https://9fans.topicbox.com/groups/9fans/subscription