merging branches

merging branches

[Коньков Евгений]

Hi, Git.


While merging branches I get conflicts in files that I have not touch.
Why they occour??

My suggestion is that that files that was automerged GIT counts as
they were modified by me, so next automerge to those files fill FAIL.

If so, how I can escape from that CONFLICT situation?


-- 
 С уважением,
 Коньков Евгений
 Программист
 Регистратор доменных имен 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

Re: Merging branches

[Avery Pennarun]

On Tue, Jul 13, 2010 at 6:05 PM, Ævar Arnfjörð Bjarmason
<avarab@gmail.com> wrote:
> On Tue, Jul 13, 2010 at 21:28, jhapk <pradeep.kumar.jha@gmail.com> wrote:
>> I have a git history which looks something like as in the figure above. I
>> want to merge Branch A in Branch B. However, the commits a1, a2 and a3 are
>> ugly and so I don't want those commits in my Branch B log. Is there anyway
>> that I can only pull the final form of Branch A without pulling the whole
>> history of Branch A?
>
> Yes, you use rebase to squash or drop those commits, and then merge the branch.

Or just "git merge --squash".

Have fun,

Avery

Re: Merging branches

[Ævar Arnfjörð Bjarmason]

On Tue, Jul 13, 2010 at 21:28, jhapk <pradeep.kumar.jha@gmail.com> wrote:
> I have a git history which looks something like as in the figure above. I
> want to merge Branch A in Branch B. However, the commits a1, a2 and a3 are
> ugly and so I don't want those commits in my Branch B log. Is there anyway
> that I can only pull the final form of Branch A without pulling the whole
> history of Branch A?

Yes, you use rebase to squash or drop those commits, and then merge the branch.

Merging branches

[jhapk]

http://git.661346.n2.nabble.com/file/n5289861/git.jpg git.jpg 

Hi,

I have a git history which looks something like as in the figure above. I
want to merge Branch A in Branch B. However, the commits a1, a2 and a3 are
ugly and so I don't want those commits in my Branch B log. Is there anyway
that I can only pull the final form of Branch A without pulling the whole
history of Branch A?

Thanks
-- 
View this message in context: http://git.661346.n2.nabble.com/Merging-branches-tp5289861p5289861.html
Sent from the git mailing list archive at Nabble.com.