GIT Rebase kastalu

[ramabeer]

Nenu add chestunna branch ki 

malli malli code add chestundu

Aina veyadam nenu teyadam... 

soft ga how to say to add eveything at once 

[dasara_bullodu1]

endukee godava ... aayina anni vesaka nuv vesko. meeting lo enduku cheyle ani adigithe appudu cheppu.. waitng chestunna ani... debba ki digi vastaru

[ZoomNaidu]

25 minutes ago, ramabeer said:

Nenu add chestunna branch ki 

malli malli code add chestundu

Aina veyadam nenu teyadam... 

soft ga how to say to add eveything at once 

OWN branch ki push chesukoni okatesaari anni push chesukovachu kadha ? 

[Spartan]

ni own branch create cheskovachu kada...

u guys are not using git properly it means.

[kamandalamjalam1]

7 minutes ago, ZoomNaidu said:

OWN branch ki push chesukoni okatesaari anni push chesukovachu kadha ? 

 

6 minutes ago, Spartan said:

ni own branch create cheskovachu kada...

u guys are not using git properly it means.

No no not at all. There is a reason for having rebase. All the commit history done so far on master branch will be gone and will be replaced by commit history of your own new branch

[Amrita]

LOcal commit chesukoni kuda rebase chesi later push chesukovachu ga ?

As @Spartan and @ZoomNaidu mentioned feature wise branches create chesukoni kuda push chesukovachu.

Memu ayite story ki we create a branch . It is also integrated with Jira so 3 amigos time lo or for architect reviews easy.  Future lo issues ki kuda Jira nunchi commits chusukovachu. 

[No_body_friends]

38 minutes ago, ramabeer said:

Nenu add chestunna branch ki 

malli malli code add chestundu

Aina veyadam nenu teyadam... 

soft ga how to say to add eveything at once 

mooskoni pakkana korcho ra poola chokka ani inko branch create chesi ivvu

[Anta Assamey]

[Spartan]

48 minutes ago, kamandalamjalam1 said:

 

No no not at all. There is a reason for having rebase. All the commit history done so far on master branch will be gone and will be replaced by commit history of your own new branch

u shud always do squash and merge on master branch to reduce the noise and commit history...

[ZoomNaidu]

@Spartan @kamandalamjalam1 : 

 

Main repo “develop” branch ni forked and created a new branch from my own fork and started making changes. 
 

The code is merged into main develop branch by all others - so I merged from upstream/develop into my develop branch again, but it’s showing my develop branch is 18 commits ahead of main develop branch where as it should be even with main develop branch kadha ? Ofcourse there are 0 files changed only.

[ChinnaBhasha]

inko branch create chesko kaka, MR pettetapudu squash chey. 

[kamandalamjalam1]

22 minutes ago, ZoomNaidu said:

@Spartan @kamandalamjalam1 : 

 

Main repo “develop” branch ni forked and created a new branch from my own fork and started making changes. 
 

The code is merged into main develop branch by all others - so I merged from upstream/develop into my develop branch again, but it’s showing my develop branch is 18 commits ahead of main develop branch where as it should be even with main develop branch kadha ? Ofcourse there are 0 files changed only.

After merging, you should commit using:

git commit -m "Your comment" .

and 

git push

 

Remember there is a DOT (.) after comment in the first command.

I am not sure if DOT is needed at all. Try with and without

 

[ChinnaBhasha]

2 minutes ago, kamandalamjalam1 said:

After merging, you should commit using:

git commit -m "Your comment" .

and 

git push

 

Remember there is a DOT (.) after comment in the first command.

I am not sure if DOT is needed at all. Try with and without

 

After merging malla commit endi? Y

[dasara_bullodu1]

18 hours ago, Spartan said:

ni own branch create cheskovachu kada...

u guys are not using git properly it means.

It doesn’t apply when both are working on one task..

[Nimmakai]

Ma team lo migration start chesina kotallo chala common files unde, rebase chesina prati sari merge conflicts tho sache valam