From: "Коньков Евгений" <kes@reg.ru>
To: git@vger.kernel.org
Subject: git BUG
Date: Mon, 22 Oct 2012 20:28:20 +0400 [thread overview]
Message-ID: <863549238.20121022202820@reg.ru> (raw)
Hi, git
I have get git bug while merging branches.
the farm has branch one year old. say b1
I have develop some feature in this year so I start new branch
git checkout master
git checkout -b b2
I get task to develop feature b1. b1 require changes in b2
git checkout b1
git merge b2
git checkout --theirs
git commit
after some time I need new code from master
git merge master
after this merge I notice that some code, that was developed in b2, is
disappeared despite on it was merged into b1
so I start to merge it again:
git merge b2
No results. So I decide to do some testing. I go to b2
git checkout b2
make changes into file on b2:
diff --git a/lib/SRS/Domain.pm b/lib/SRS/Domain.pm
index 8fa1b1a..23a9429 100644
--- a/lib/SRS/Domain.pm
+++ b/lib/SRS/Domain.pm
@@ -2804,6 +2804,7 @@ sub can_renew_state {
sub zone {
my ( $self ) = @_;
+
load_class 'SRS::Comm::Zone::Domain';
return
I have add one empty line to subroutine that have developed in b2.
git commit
git checkout b1
git merge b2
and I get conflict:
+++ b/lib/SRS/Domain.pm
@@@ -2830,24 -2801,20 +2830,29 @@@ sub can_renew_state
=cut
-sub zone {
- my ( $self ) = @_;
+sub can_cancel_transin {
+ my $self = shift;
++<<<<<<< HEAD
+ return if $self->{freeze_date};
+ return unless $self->{create_method} eq 'trans' && $self->{state} eq 'N';
++=======
+
+ load_class 'SRS::Comm::Zone::Domain';
++>>>>>>> yandex_mail_new_api
- return
- SRS::Comm::Zone::Domain->new(
- dname => $self->{dname},
- service => $self,
- );
+ my ( $pos_id ) = dbh_rw->selectrow_array(
+ 'SELECT bi.pos_id FROM billitems bi JOIN bills b ON b.bill_id = bi.bill_id WHERE service_id =
+ undef,
+ $self->{service_id}, $self->{user_id}
+ );
+
+ return $pos_id;
}
-=back
+=item cancel_transin
+
+Ф-ция отмены переноса
=cut
As you can see conflict at 'can_cancel_transin' subroutine
but I do changes in 'zone' subroutine
Please help to resolve that CONFLICT and return code from b2 to be
alive again in b1.
And, if you can, please explain why this occur
--
С уважением,
Коньков Евгений
Программист
Регистратор доменных имен REG.RU
Телефон: +38 (097) 7654-676
www.reg.ru
___________________
Sincerely yours,
Konkov Eugen
Developer
Accredited domain Registrar REG.RU, LLC.
Phone: +38 (097) 7654-676
www.reg.ru/en/
mailto:kes@reg.ru
next reply other threads:[~2012-10-22 16:28 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-22 16:28 Коньков Евгений [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-08-06 14:48 git bug PANEL Christian
2020-08-06 20:23 ` René Scharfe
2020-08-07 0:02 ` Jeff King
2020-08-10 5:56 ` René Scharfe
2020-08-10 17:20 ` PANEL Christian
2020-08-06 14:59 PANEL Christian
2023-04-14 8:29 Git bug Gabriel Furstenheim Milerud
2023-04-14 9:26 ` Kristoffer Haugsbakk
2023-04-14 9:41 Gabriel Furstenheim Milerud
2023-04-14 16:07 ` René Scharfe
[not found] ` <CAJN3DWpvh8uHnRFnaPgg8U6dW=3xP9YULBe-xfeTAg2SV7K+oQ@mail.gmail.com>
2023-04-17 9:46 ` Gabriel Furstenheim Milerud
2024-02-04 23:42 git bug moti sd
2024-02-05 6:47 ` Patrick Steinhardt
2024-02-08 19:32 Justin Tang
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=863549238.20121022202820@reg.ru \
--to=kes@reg.ru \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).