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@xxxxxx
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html