Tracking a branch using StGIT

From: Rajkumar S <rajkumars+git@gmail.com>
Date: Sep 15, 2006, 08:20 UTC
Message-ID: <64de5c8b0609150120h3aeee6dcv976da13134396654@mail.gmail.com>

Hi,

I am using StGIT to track a branch of a remote git repository (actually a remote cvs repository, which I am tracking cvsimport)

The remote repository git branch show:
  Package-Reorg-2005
  RELENG_1
  avendor
* master
  origin

My local repository has:

root@beastie:# stg branch -l Available branches:

> s     MyBranch            | clone of "RELENG_1"

        Package-Reorg-2005  |
  s     RELENG_1            |
        avendor             |
        master              |
        origin              |

The .git/remotes/origin is
URL: /usr/local/pfSense/upstream/pfSense/.git
Pull: refs/heads/master:refs/heads/origin
Pull: refs/heads/avendor:refs/heads/avendor
Pull: refs/heads/Package-Reorg-2005:refs/heads/Package-Reorg-2005
Pull: refs/heads/RELENG_1:refs/heads/RELENG_1

My requirement is to track RELENG_1 branch with StGIT while maintaining my own patches. but when I do a stg pull the messages are:

Popping all applied patches... done Pulling from "origin"... Trying really trivial in-index merge... fatal: Merge requires file-level merging Nope. Merging HEAD with c0a06b86b8431293214f5eb18e49fcb8117c6070 Merging: 997e28966d7b7964562232628cc4f64dccbead9e Execute after commands via sh & c0a06b86b8431293214f5eb18e49fcb8117c6070 Execute after commands via sh & found 1 common ancestor(s): 1b08ecedad1e6a7199f12d1fad97373587c85454 Minor nitpick. <br> after firmware branch select box CONFLICT (add/add): File usr/local/www/status_filter_reload.php added non-identically in both branches. Adding as usr/local/www/status_filter_reload.php~HEAD and usr/local/www/status_filter_reload.php~c0a06b86b8431293214f5eb18e49fcb8117c6070 instead. <snip>

It seems StGIT is trying to merge the origin branch from remote to RELENG_1 of local. Is there a way to get RELENG_1 of remote to merge with MyBranch (clone of "RELENG_1") of local?

raj