From: "Rajkumar S" <rajkumars+git@gmail.com>
To: catalin.marinas@gmail.com
Cc: git@vger.kernel.org
Subject: Tracking a branch using StGIT
Date: Fri, 15 Sep 2006 13:50:45 +0530 [thread overview]
Message-ID: <64de5c8b0609150120h3aeee6dcv976da13134396654@mail.gmail.com> (raw)
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
next reply other threads:[~2006-09-15 8:20 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-09-15 8:20 Rajkumar S [this message]
2006-09-15 10:42 ` Tracking a branch using StGIT Catalin Marinas
2006-09-15 10:58 ` Andy Whitcroft
2006-09-15 11:17 ` Santi
2006-09-15 11:34 ` Rajkumar S
2006-09-15 11:32 ` Rajkumar S
2006-09-15 11:42 ` Jakub Narebski
2006-09-15 11:59 ` Rajkumar S
2006-09-15 12:09 ` Jakub Narebski
2006-09-15 12:18 ` Rajkumar S
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=64de5c8b0609150120h3aeee6dcv976da13134396654@mail.gmail.com \
--to=rajkumars+git@gmail.com \
--cc=catalin.marinas@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).